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

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

Issue 1438413004: Port placeholders logic GYP->GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix assert Created 5 years, 1 month 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/config/android/internal_rules.gni ('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 090f55700ca812a3d4c02daf497d0d76a60a739d..6da7fe4dec84f2decaaeaf3ffb1f28421ab00de7 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1186,6 +1186,8 @@ template("android_java_prebuilt") {
# native_libs: List paths of native libraries to include in this apk. If these
# libraries depend on other shared_library targets, those dependencies will
# also be included in the apk.
+# native_lib_placeholders: List of placeholder filenames to add to the apk
+# (optional).
# apk_under_test: For an instrumentation test apk, this is the target of the
# tested apk.
# include_all_resources - If true include all resource IDs in all generated
@@ -1655,6 +1657,12 @@ template("android_apk") {
if (_native_libs != [] && !_create_abi_split) {
native_libs_dir = _native_libs_dir
+
+ # Placeholders are not necessary for L+, so add them here, but don't
+ # bother to create them in the case of splits.
+ # http://crbug.com/395038
+ forward_variables_from(invoker, [ "native_lib_placeholders" ])
+
deps += [ ":$_prepare_native_target_name" ]
}
}
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698