Revert of Android: Delete rezip in favor of zipalign -p

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 143 matching lines @@
 
 
 def _CreateAssetsList(path_tuples):
   """Returns a newline-separated list of asset paths for the given paths."""
   dests = sorted(t[1] for t in path_tuples)
   return '\n'.join(dests) + '\n'
 
 
 def _AddNativeLibraries(out_apk, native_libs, android_abi, uncompress):
   """Add native libraries to APK."""
-  has_crazy_linker = any('android_linker' in os.path.basename(p)
-                         for p in native_libs)
   for path in native_libs:
     basename = os.path.basename(path)
+    apk_path = 'lib/%s/%s' % (android_abi, basename)
 
     compress = None
-    if (uncompress and os.path.splitext(basename)[1] == '.so'
-        and 'android_linker' not in basename):
+    if (uncompress and os.path.splitext(basename)[1] == '.so'):
       compress = False
-      # Add prefix to prevent android install from extracting upon install.
-      if has_crazy_linker:
-        basename = 'crazy.' + basename
 
-    apk_path = 'lib/%s/%s' % (android_abi, basename)
     build_utils.AddToZipHermetic(out_apk,
                                  apk_path,
                                  src_path=path,
                                  compress=compress)
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
@@ skipping 76 matching lines @@
                             options.android_abi,
                             options.uncompress_shared_libraries)
 
         if options.secondary_android_abi:
           _AddNativeLibraries(out_apk,
                               secondary_native_libs,
                               options.secondary_android_abi,
                               options.uncompress_shared_libraries)
 
         for name in sorted(options.native_lib_placeholders):
-          # Note: Empty libs files are ignored by md5check (can cause issues
-          # with stale builds when the only change is adding/removing
-          # placeholders).
+          # Empty libs files are ignored by md5check, but rezip requires them
+          # to be empty in order to identify them as placeholders.
           apk_path = 'lib/%s/%s' % (options.android_abi, name)
           build_utils.AddToZipHermetic(out_apk, apk_path, data='')
 
         # 5. Resources
         for info in resource_infos[1:]:
           copy_resource(info)
 
         # 6. Java resources. Used only when coverage is enabled, so order
         # doesn't matter).
         if options.emma_device_jar:
@@ skipping 22 matching lines @@
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk],
       depfile_deps=depfile_deps)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])