Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2340)

Unified Diff: build/config/android/rules.gni

Issue 2634563002: android_webview: support building a stub WebView. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/write_ordered_libraries.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 902c6a12054d9956ce6206c2335f8c374548ee28..818ec4419b1a24e09161c670adedefa4b4d87ef7 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)) {
+ _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"
jbudorick 2017/01/13 20:45:48 :O
Torne 2017/01/16 12:49:01 Yeah, I noticed that when looking in the out direc
+ "$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"
@@ -1724,6 +1728,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",
]
}
« no previous file with comments | « build/android/gyp/write_ordered_libraries.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698