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

Unified Diff: chrome/android/BUILD.gn

Issue 1421473010: Replace most uses of asset_location with android_assets() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 31c4d25c8018389fd2f99659e67dedd6a7ae9f1c..9c6dd330526a04d8c8a44a6ebb84305db496fd26 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -347,26 +347,17 @@ android_resources("chrome_public_apk_resources") {
]
}
-copy_ex("chrome_public_apk_assets") {
- clear_dir = true
- dest = "$root_build_dir/chrome_public_apk_assets"
+android_assets("chrome_public_apk_assets") {
sources = chrome_android_paks_gypi.chrome_android_pak_input_resources
- if (icu_use_data_file) {
- sources += [ "$root_build_dir/icudtl.dat" ]
- }
+ sources += [ "$root_build_dir/resources.pak" ]
+ disable_compression = true
+
deps = [
"//chrome:packed_extra_resources",
"//chrome:packed_resources",
- "//third_party/icu:icudata",
+ "//third_party/icu:icu_assets",
+ "//v8:v8_external_startup_data_assets",
]
-
- if (v8_use_external_startup_data) {
- renaming_sources = v8_external_startup_data_renaming_sources
- renaming_destinations = v8_external_startup_data_renaming_destinations
- deps += [ "//v8" ]
- }
-
- sources += [ "$root_build_dir/resources.pak" ]
}
# GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
« no previous file with comments | « no previous file | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698