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

Unified Diff: chrome/BUILD.gn

Issue 2353553004: Revert of Create Monochrome-specific repack() targets (Closed)
Patch Set: Created 4 years, 3 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/config/android/internal_rules.gni ('k') | chrome/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 268328b6710a39f18f7404924e3ba3402d5cf181..34871923107f9cc28e520fbb241d114e55d52ea2 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -16,6 +16,7 @@
import("//chrome/process_version_rc_template.gni")
import("//third_party/widevine/cdm/widevine.gni")
import("//tools/resources/generate_resource_whitelist.gni")
+import("//ui/base/ui_features.gni")
import("//v8/gni/v8.gni")
if (is_android) {
@@ -252,7 +253,10 @@
}
# These files are used by the installer so we need a public dep.
- public_deps += [ ":packed_resources" ]
+ public_deps += [
+ ":packed_extra_resources",
+ ":packed_resources",
+ ]
# Only ChromeOS has precompiled Flash that needs to get copied to the output
# directory. On other platforms, Flash is either component-updated only or
@@ -734,6 +738,7 @@
]
public_deps = [
+ ":packed_extra_resources",
":packed_resources",
"//chrome/app_shim:app_mode_loader",
]
@@ -1347,6 +1352,23 @@
}
}
+chrome_extra_paks("packed_extra_resources") {
+ if (is_mac) {
+ output_dir = "$root_gen_dir/repack"
+ copy_data_to_bundle = true
+ } else {
+ output_dir = root_out_dir
+ }
+
+ copy_data_to_bundle = is_mac
+ if (enable_resource_whitelist_generation) {
+ repack_whitelist = chrome_resource_whitelist
+ deps = [
+ ":resource_whitelist",
+ ]
+ }
+}
+
repack("browser_tests_pak") {
sources = [
"$root_gen_dir/chrome/options_test_resources.pak",
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698