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

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

Issue 1435333008: GN: asset_location -> android_assets() for html_viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaswe 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/android/gyp/apkbuilder.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ce158eff6a0f75ca011227f117bde863db4ea991 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -667,6 +667,8 @@ template("emma_instr") {
# native_lib_placeholders: List of placeholder filenames to add to the apk
# (optional).
# native_libs_dir: Directory containing native libraries.
+# write_asset_list: Adds an extra file to the assets, which contains a list of
+# all other asset files.
template("package_apk") {
action(target_name) {
forward_variables_from(invoker,
@@ -717,6 +719,9 @@ template("package_apk") {
"--uncompressed-assets=@FileArg($_rebased_build_config:uncompressed_assets)",
]
}
+ if (defined(invoker.write_asset_list) && invoker.write_asset_list) {
+ args += [ "--write-asset-list" ]
+ }
if (defined(invoker.dex_path)) {
_rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
args += [ "--dex-file=$_rebased_dex_path" ]
@@ -1009,6 +1014,7 @@ template("create_apk") {
"emma_instrument",
"native_lib_placeholders",
"native_libs_dir",
+ "write_asset_list",
])
deps = _deps + [ ":${_package_resources_target_name}" ]
« no previous file with comments | « build/android/gyp/apkbuilder.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698