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

Unified Diff: remoting/host/it2me/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 | « remoting/host/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me/BUILD.gn
diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
index e97e871e2a3fd762dae5c7577ce60045a2bbf9a6..521abb25e8c03d7982f06045b498c32ec8796297 100644
--- a/remoting/host/it2me/BUILD.gn
+++ b/remoting/host/it2me/BUILD.gn
@@ -13,6 +13,7 @@ if (is_win) {
}
if (is_mac) {
import("//build/config/mac/rules.gni")
+ import("//third_party/icu/config.gni")
}
source_set("common") {
@@ -100,18 +101,20 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
]
}
- bundle_data("remote_assistance_host_resources") {
- sources = [
- "$root_out_dir/icudtl.dat",
- ]
+ if (icu_use_data_file) {
+ bundle_data("remote_assistance_host_resources") {
+ sources = [
+ "$root_out_dir/icudtl.dat",
+ ]
- outputs = [
- "{{bundle_resources_dir}}/{{source_file_part}}",
- ]
+ outputs = [
+ "{{bundle_resources_dir}}/{{source_file_part}}",
+ ]
- public_deps = [
- "//third_party/icu:icudata",
- ]
+ public_deps = [
+ "//third_party/icu:icudata",
+ ]
+ }
}
} else {
app_target_type = "executable"
@@ -159,11 +162,13 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
]
}
deps += [
- ":remote_assistance_host_resources",
":remote_assistance_host_xibs",
"//remoting/host:remoting_infoplist_strings",
"//remoting/resources:copy_locales",
]
+ if (icu_use_data_file) {
+ deps += [ ":remote_assistance_host_resources" ]
+ }
}
if (enable_webrtc) {
« no previous file with comments | « remoting/host/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698