Chromium Code Reviews| Index: build/config/android/rules.gni |
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
| index 902c6a12054d9956ce6206c2335f8c374548ee28..2349dde9c1768964483b23a6cfc3333311262f15 100644 |
| --- a/build/config/android/rules.gni |
| +++ b/build/config/android/rules.gni |
| @@ -1533,6 +1533,10 @@ if (enable_java_templates) { |
| _secondary_abi_shared_libraries_is_valid = |
| defined(invoker.secondary_abi_shared_libraries) && |
| invoker.secondary_abi_shared_libraries != [] |
| + _unpackaged_shared_libs = [] |
| + if (defined(invoker.unpackaged_shared_libraries)) { |
|
michaelbai
2017/01/18 22:59:21
Please update template description with this varia
Torne
2017/01/19 14:23:12
Added in my next version (not uploaded yet as I'm
|
| + _unpackaged_shared_libs += invoker.unpackaged_shared_libraries |
| + } |
| if (is_component_build || is_asan) { |
| if (_shared_libraries_is_valid) { |
| @@ -1556,15 +1560,6 @@ if (enable_java_templates) { |
| deps = _native_libs_deps |
| write_runtime_deps = _runtime_deps_file |
| } |
| - |
| - _native_lib_version_rule = "" |
| - if (defined(invoker.native_lib_version_rule)) { |
| - _native_lib_version_rule = invoker.native_lib_version_rule |
| - } |
| - _native_lib_version_arg = "\"\"" |
| - if (defined(invoker.native_lib_version_arg)) { |
| - _native_lib_version_arg = invoker.native_lib_version_arg |
| - } |
| } |
| if (_secondary_abi_shared_libraries_is_valid) { |
| @@ -1699,13 +1694,22 @@ if (enable_java_templates) { |
| } |
| _srcjar_deps += [ ":$process_resources_target" ] |
| - if (_native_libs_deps != []) { |
| + if (_native_libs_deps != [] || _unpackaged_shared_libs != []) { |
| + _native_lib_version_rule = "" |
| + if (defined(invoker.native_lib_version_rule)) { |
| + _native_lib_version_rule = invoker.native_lib_version_rule |
| + } |
| + _native_lib_version_arg = "\"\"" |
| + if (defined(invoker.native_lib_version_arg)) { |
| + _native_lib_version_arg = invoker.native_lib_version_arg |
| + } |
| + |
| _enable_chromium_linker_tests = false |
| if (defined(invoker.enable_chromium_linker_tests)) { |
| _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests |
| } |
| _ordered_libraries_json = |
| - "$target_gen_dir/$target_name.ordered_libararies.json" |
| + "$target_gen_dir/$target_name.ordered_libraries.json" |
| _rebased_ordered_libraries_json = |
| rebase_path(_ordered_libraries_json, root_build_dir) |
| _ordered_libraries_target = "${_template_name}__write_ordered_libraries" |
| @@ -1714,6 +1718,9 @@ if (enable_java_templates) { |
| # not need this manual sorting step. |
| action(_ordered_libraries_target) { |
| script = "//build/android/gyp/write_ordered_libraries.py" |
| + |
| + # Don't add _unpackaged_shared_libs to deps, because we don't actually |
| + # build those libraries at all. |
| deps = _native_libs_deps + [ ":$build_config_target" ] |
| outputs = [ |
| _ordered_libraries_json, |
| @@ -1724,6 +1731,7 @@ if (enable_java_templates) { |
| "--output=$_rebased_ordered_libraries_json", |
| "--libraries-dir=.", |
| "--input-libraries=@FileArg($_rebased_build_config:native:libraries)", |
| + "--unpackaged-libraries=$_unpackaged_shared_libs", |
| ] |
| } |