Fix order of files within APK when built using GN

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 175 matching lines @@
 
         # 2. Assets
         if options.write_asset_list:
           data = _CreateAssetsList(
               itertools.chain(_assets, _uncompressed_assets))
           build_utils.AddToZipHermetic(out_apk, 'assets/assets_list', data=data)
 
         _AddAssets(out_apk, _assets, disable_compression=False)
         _AddAssets(out_apk, _uncompressed_assets, disable_compression=True)
 
-        # 3. Resources
-        for info in resource_infos[1:]:
-          copy_resource(info)
-
-        # 4. Dex files
+        # 3. Dex files
         if options.dex_file and options.dex_file.endswith('.zip'):
           with zipfile.ZipFile(options.dex_file, 'r') as dex_zip:
             for dex in (d for d in dex_zip.namelist() if d.endswith('.dex')):
               build_utils.AddToZipHermetic(out_apk, dex, data=dex_zip.read(dex))
         elif options.dex_file:
           build_utils.AddToZipHermetic(out_apk, 'classes.dex',
                                        src_path=options.dex_file)
 
-        # 5. Native libraries.
+        # 4. Native libraries.
         for path in native_libs:
           basename = os.path.basename(path)
           apk_path = 'lib/%s/%s' % (options.android_abi, basename)
           build_utils.AddToZipHermetic(out_apk, apk_path, src_path=path)
 
         for name in sorted(options.native_lib_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:
           # Add EMMA Java resources to APK.
           with zipfile.ZipFile(options.emma_device_jar, 'r') as emma_device_jar:
             for apk_path in emma_device_jar.namelist():
               apk_path_lower = apk_path.lower()
               if apk_path_lower.startswith('meta-inf/'):
                 continue
 
@@ skipping 14 matching lines @@
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk])
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])