fix permission handling

Author: adincebic

tools/bundletool/bundletool.py

@@ -257,15 +257,15 @@ def _entry_is_executable(self, src, dest, executable,
     if not normalize_bundle_file_permissions:
       return os.access(src, os.X_OK)
 
-    if dest.endswith('/Info.plist') or '/Resources/' in dest:
-      return False
     if '/Contents/MacOS/' in dest:
       return True
     if dest.endswith('.dylib'):
       return True
     if '.framework/' in dest:
       framework_name = dest.split('.framework/', 1)[0].rsplit('/', 1)[-1]
       return os.path.basename(dest) == framework_name
+    if dest.endswith('/Info.plist') or '/Resources/' in dest:
+      return False
     return os.access(src, os.X_OK)
 
   def _add_zip_contents(self, src, dest, out_zip, compress):

tools/bundletool/bundletool_test.py

@@ -329,6 +329,39 @@ def test_bundle_merge_files_normalizes_bundle_permissions(self):
           'app.app/Contents/Frameworks/Foo.framework/Versions/A/Foo',
           True)
 
+  def test_bundle_merge_files_normalizes_nested_bundle_permissions_in_resources(self):
+    os.makedirs(os.path.join(
+        self._scratch_dir,
+        'app.app',
+        'Contents',
+        'Resources',
+        'Helper.app',
+        'Contents',
+        'MacOS'))
+    self._scratch_file(
+        'app.app/Contents/Resources/Helper.app/Contents/Info.plist',
+        executable=True)
+    self._scratch_file(
+        'app.app/Contents/Resources/Helper.app/Contents/MacOS/Helper',
+        executable=True)
+
+    out_zip = _run_bundler({
+        'bundle_merge_files': [{
+            'src': os.path.join(self._scratch_dir, 'app.app'),
+            'dest': 'app.app',
+            'normalize_bundle_file_permissions': True,
+        }],
+    })
+    with zipfile.ZipFile(out_zip, 'r') as z:
+      self._assert_zip_contains(
+          z,
+          'app.app/Contents/Resources/Helper.app/Contents/Info.plist',
+          False)
+      self._assert_zip_contains(
+          z,
+          'app.app/Contents/Resources/Helper.app/Contents/MacOS/Helper',
+          True)
+
   def test_bundle_merge_zips(self):
     foo_zip = self._scratch_zip('foo.zip',
                                 'foo.bundle/img.png', 'foo.bundle/strings.txt')