Remove root_merge_zips support from bundletool.

This hasn't been used by the Apple rules for some time.

Cherry-pick: 6c4a5dc

Author: nglevin

tools/bundletool/bundletool.py

@@ -43,13 +43,6 @@
       `bundle_path`.
   output: The path to the uncompressed ZIP archive that should be created with
       the merged bundle contents.
-  root_merge_zips: A list of dictionaries representing the ZIP archives whose
-      contents should be merged into the archive at the root. Each dictionary
-      contains two fields: "src", the path of the archive whose contents should
-      be merged into the archive; and "dest", the path inside the archive where
-      the ZIPs contents should be placed. This is used for support files, such
-      as Swift libraries and watchOS stub executables, that must be shipped to
-      Apple at the root of the archive as well as within the bundle itself.
 """
 
 import hashlib
@@ -108,7 +101,6 @@ def run(self):
     bundle_path = self._control.get('bundle_path', '')
     bundle_merge_files = self._control.get('bundle_merge_files', [])
     bundle_merge_zips = self._control.get('bundle_merge_zips', [])
-    root_merge_zips = self._control.get('root_merge_zips', [])
     compress = self._control.get('compress', False)
 
     with zipfile.ZipFile(output_path, 'w', allowZip64 = True) as out_zip:
@@ -121,9 +113,6 @@ def run(self):
         self._add_files(f['src'], dest, f.get('executable', False),
                         f.get('contents_only', False), out_zip, compress)
 
-      for z in root_merge_zips:
-        self._add_zip_contents(z['src'], z['dest'], out_zip, compress)
-
     with zipfile.ZipFile(output_path, 'r') as test_zip:
       badfile = test_zip.testzip()
       if badfile:

tools/bundletool/bundletool_test.py

@@ -87,8 +87,7 @@ def _scratch_zip(self, name, *entries):
     """Creates a scratch ZIP file with the given entries.
 
     The scratch ZIP's path, which is returned by this function, can then be
-    passed into the bunlder as one of its `bundle_merge_zips` or
-    `root_merge_zips`.
+    passed into the bunlder as one of its `bundle_merge_zips`.
 
     Args:
       name: The name of the ZIP file.
@@ -234,33 +233,6 @@ def test_bundle_merge_zips_propagates_executable(self):
     with zipfile.ZipFile(out_zip, 'r') as z:
       self._assert_zip_contains(z, 'Payload/foo.app/foo.bundle/some.exe', True)
 
-  def test_root_merge_zips(self):
-    support_zip = self._scratch_zip('support.zip', 'SomeSupport/some.dylib')
-    out_zip = _run_bundler({
-        'bundle_path': 'Payload/foo.app',
-        'root_merge_zips': [{'src': support_zip, 'dest': '.'}],
-    })
-    with zipfile.ZipFile(out_zip, 'r') as z:
-      self._assert_zip_contains(z, 'SomeSupport/some.dylib')
-
-  def test_root_merge_zips_with_different_destination(self):
-    support_zip = self._scratch_zip('support.zip', 'some.dylib')
-    out_zip = _run_bundler({
-        'bundle_path': 'Payload/foo.app',
-        'root_merge_zips': [{'src': support_zip, 'dest': 'SomeSupport'}],
-    })
-    with zipfile.ZipFile(out_zip, 'r') as z:
-      self._assert_zip_contains(z, 'SomeSupport/some.dylib')
-
-  def test_root_merge_zips_propagates_executable(self):
-    support_zip = self._scratch_zip('support.zip', '*SomeSupport/some.dylib')
-    out_zip = _run_bundler({
-        'bundle_path': 'Payload/foo.app',
-        'root_merge_zips': [{'src': support_zip, 'dest': '.'}],
-    })
-    with zipfile.ZipFile(out_zip, 'r') as z:
-      self._assert_zip_contains(z, 'SomeSupport/some.dylib', True)
-
   def test_duplicate_files_with_same_content_are_allowed(self):
     foo_txt = self._scratch_file('foo.txt', 'foo')
     bar_txt = self._scratch_file('bar.txt', 'foo')