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

Unified Diff: chrome/BUILD.gn

Issue 2181043003: Fix GN build on mac with icu_use_data_file = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move (public)_deps inside if-icu_use_data_file Created 4 years, 5 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 | « no previous file | content/shell/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 8b3ab7afb6430940a862c39fa1554cd08621a7b0..494dced5162eb923614e0c6056d2c10fe2c7de45 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -28,6 +28,7 @@ if (is_android) {
import("//build/util/version.gni")
import("//build_overrides/v8.gni")
import("//media/cdm/ppapi/cdm_paths.gni")
+ import("//third_party/icu/config.gni")
}
if (is_win) {
@@ -737,7 +738,6 @@ if (is_win) {
"$root_gen_dir/repack/resources.pak",
"$root_out_dir/app_mode_loader.app",
"$root_out_dir/chrome_100_percent.pak",
- "$root_out_dir/icudtl.dat",
"app/theme/default_100_percent/$branding_path_component/product_logo_32.png",
"browser/mac/install.sh",
]
@@ -750,7 +750,6 @@ if (is_win) {
":packed_extra_resources",
":packed_resources",
"//chrome/app_shim:app_mode_loader",
- "//third_party/icu:icudata",
]
if (enable_hidpi) {
@@ -774,6 +773,11 @@ if (is_win) {
]
}
+ if (icu_use_data_file) {
+ sources += [ "$root_out_dir/icudtl.dat" ]
+ public_deps += [ "//third_party/icu:icudata" ]
+ }
+
if (v8_use_external_startup_data) {
sources += [
"$root_out_dir/natives_blob.bin",
« no previous file with comments | « no previous file | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698