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

Unified Diff: content/shell/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 | « chrome/BUILD.gn ('k') | remoting/host/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index bb5eac67f30a361c146e554d42931974bc01c88e..495e3a1843894ea4c8931ff3704c57a353a5481d 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -16,6 +16,7 @@ if (is_android) {
} else if (is_mac) {
import("//build/config/mac/rules.gni")
import("//build/mac/tweak_info_plist.gni")
+ import("//third_party/icu/config.gni")
import("//v8/gni/v8.gni")
} else if (is_win) {
import("//build/win/syzygy/syzygy.gni")
@@ -572,7 +573,6 @@ if (is_mac) {
bundle_data("content_shell_framework_resources") {
sources = [
"$root_out_dir/content_shell.pak",
- "$root_out_dir/icudtl.dat",
"resources/missingImage.png",
"resources/textAreaResizeCorner.png",
]
@@ -581,9 +581,12 @@ if (is_mac) {
":pak",
]
- deps = [
- "//third_party/icu:icudata",
- ]
+ if (icu_use_data_file) {
+ sources += [ "$root_out_dir/icudtl.dat" ]
+ deps = [
+ "//third_party/icu:icudata",
+ ]
+ }
if (v8_use_external_startup_data) {
sources += [
« no previous file with comments | « chrome/BUILD.gn ('k') | remoting/host/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698