Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index 3d91676e9f4b641d9c182ef1c0d9e88dc406a615..fb78f555d397aa525a0a6ac9251062198f62e2c3 100644 |
--- a/build/config/android/internal_rules.gni |
+++ b/build/config/android/internal_rules.gni |
@@ -664,6 +664,7 @@ template("emma_instr") { |
# dex_path: Path to classes.dex file to include (optional). |
# resource_packaged_apk_path: Path to .ap_ to use. |
# output_apk_path: Output path for the generated .apk. |
+# native_libs: List of .so files to include. |
# native_lib_placeholders: List of placeholder filenames to add to the apk |
# (optional). |
# native_libs_dir: Directory containing native libraries. |
@@ -721,7 +722,8 @@ template("package_apk") { |
_rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir) |
args += [ "--dex-file=$_rebased_dex_path" ] |
} |
- if (defined(invoker.native_libs_dir) || _native_lib_placeholders != []) { |
+ if (defined(invoker.native_libs_dir) || defined(invoker.native_libs) || |
+ _native_lib_placeholders != []) { |
args += [ "--android-abi=$android_app_abi" ] |
} |
if (defined(invoker.native_libs_dir)) { |
@@ -729,6 +731,10 @@ template("package_apk") { |
rebase_path(invoker.native_libs_dir, root_build_dir) |
args += [ "--native-libs-dir=$_rebased_native_libs_dir/$android_app_abi" ] |
} |
+ if (defined(invoker.native_libs)) { |
+ _rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir) |
+ args += [ "--native-libs=$_rebased_native_libs" ] |
+ } |
if (_native_lib_placeholders != []) { |
args += [ "--native-lib-placeholders=$_native_lib_placeholders" ] |
} |
@@ -1008,6 +1014,7 @@ template("create_apk") { |
"assets_build_config", |
"emma_instrument", |
"native_lib_placeholders", |
+ "native_libs", |
"native_libs_dir", |
]) |
deps = _deps + [ ":${_package_resources_target_name}" ] |
@@ -1026,6 +1033,7 @@ template("create_apk") { |
[ |
"assets_build_config", |
"emma_instrument", |
+ "native_libs", |
]) |
_dex_target = "//build/android/incremental_install:bootstrap_java__dex" |
deps = _incremental_deps + [ |