Chromium Code Reviews| Index: build/config/android/rules.gni |
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
| index 090f55700ca812a3d4c02daf497d0d76a60a739d..962df79c57efce96d5e1c379b10574fe12b6dd9b 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,10 @@ 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. |
|
pkotwicz
2015/11/16 19:28:22
Can you mention the relevant bug in the comment? I
agrieve
2015/11/16 19:45:15
Done.
|
| + forward_variables_from(invoker, [ "native_lib_placeholders" ]) |
|
pkotwicz
2015/11/16 19:28:22
Nit: new line
agrieve
2015/11/16 19:45:15
Done.
|
| deps += [ ":$_prepare_native_target_name" ] |
| } |
| } |