Make secondary abi work for component build

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 172 matching lines @@
 
   input_paths = [options.resource_apk, __file__] + native_libs
   # Include native libs in the depfile_deps since GN doesn't know about the
   # dependencies when is_component_build=true.
   depfile_deps = list(native_libs)
 
   secondary_native_libs = []
   if options.secondary_native_libs:
     secondary_native_libs = sorted(options.secondary_native_libs)
     input_paths += secondary_native_libs
-    depfile_deps += secondary_native_libs
+    depfile_deps += list(secondary_native_libs)

[agrieve, 2016/09/08 01:02:15]

Does this do anything?

[michaelbai, 2016/09/08 18:52:50]

No difference, I wanted to match the native_libs, remove it.

 
   if options.dex_file:
     input_paths.append(options.dex_file)
 
   if options.emma_device_jar:
     input_paths.append(options.emma_device_jar)
 
   input_strings = [options.android_abi,
                    options.native_lib_placeholders,
                    options.uncompress_shared_libraries]
@@ skipping 98 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:])