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

Side by Side 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, 4 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 unified diff | Download patch
« no previous file with comments | « remoting/host/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//remoting/remoting_enable.gni") 6 import("//remoting/remoting_enable.gni")
7 import("//remoting/remoting_srcs.gni") 7 import("//remoting/remoting_srcs.gni")
8 import("//remoting/remoting_locales.gni") 8 import("//remoting/remoting_locales.gni")
9 import("//remoting/remoting_version.gni") 9 import("//remoting/remoting_version.gni")
10 10
11 if (is_win) { 11 if (is_win) {
12 import("//remoting/host/predefines_win.gni") 12 import("//remoting/host/predefines_win.gni")
13 } 13 }
14 if (is_mac) { 14 if (is_mac) {
15 import("//build/config/mac/rules.gni") 15 import("//build/config/mac/rules.gni")
16 import("//third_party/icu/config.gni")
16 } 17 }
17 18
18 source_set("common") { 19 source_set("common") {
19 sources = rebase_path( 20 sources = rebase_path(
20 remoting_host_srcs_gypi_values.remoting_it2me_host_static_sources, 21 remoting_host_srcs_gypi_values.remoting_it2me_host_static_sources,
21 ".", 22 ".",
22 "//remoting") 23 "//remoting")
23 24
24 if (is_android) { 25 if (is_android) {
25 sources -= [ 26 sources -= [
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ] 94 ]
94 } 95 }
95 } 96 }
96 97
97 mac_xib_bundle_data("remote_assistance_host_xibs") { 98 mac_xib_bundle_data("remote_assistance_host_xibs") {
98 sources = [ 99 sources = [
99 "//remoting/host/disconnect_window.xib", 100 "//remoting/host/disconnect_window.xib",
100 ] 101 ]
101 } 102 }
102 103
103 bundle_data("remote_assistance_host_resources") { 104 if (icu_use_data_file) {
104 sources = [ 105 bundle_data("remote_assistance_host_resources") {
105 "$root_out_dir/icudtl.dat", 106 sources = [
106 ] 107 "$root_out_dir/icudtl.dat",
108 ]
107 109
108 outputs = [ 110 outputs = [
109 "{{bundle_resources_dir}}/{{source_file_part}}", 111 "{{bundle_resources_dir}}/{{source_file_part}}",
110 ] 112 ]
111 113
112 public_deps = [ 114 public_deps = [
113 "//third_party/icu:icudata", 115 "//third_party/icu:icudata",
114 ] 116 ]
117 }
115 } 118 }
116 } else { 119 } else {
117 app_target_type = "executable" 120 app_target_type = "executable"
118 } 121 }
119 122
120 target(app_target_type, "remote_assistance_host") { 123 target(app_target_type, "remote_assistance_host") {
121 if (is_mac) { 124 if (is_mac) {
122 info_plist = "remote_assistance_host-Info.plist" 125 info_plist = "remote_assistance_host-Info.plist"
123 extra_substitutions = [ 126 extra_substitutions = [
124 "BUNDLE_ID=$remote_assistance_host_bundle_id", 127 "BUNDLE_ID=$remote_assistance_host_bundle_id",
(...skipping 27 matching lines...) Expand all
152 "//ui/gfx", 155 "//ui/gfx",
153 ] 156 ]
154 if (is_mac) { 157 if (is_mac) {
155 foreach(locale, remoting_locales_with_underscores) { 158 foreach(locale, remoting_locales_with_underscores) {
156 deps += [ 159 deps += [
157 ":remote_assistance_host_strings_${locale}_bundle_data", 160 ":remote_assistance_host_strings_${locale}_bundle_data",
158 "//remoting/host:remoting_host_locale_${locale}_bundle_data", 161 "//remoting/host:remoting_host_locale_${locale}_bundle_data",
159 ] 162 ]
160 } 163 }
161 deps += [ 164 deps += [
162 ":remote_assistance_host_resources",
163 ":remote_assistance_host_xibs", 165 ":remote_assistance_host_xibs",
164 "//remoting/host:remoting_infoplist_strings", 166 "//remoting/host:remoting_infoplist_strings",
165 "//remoting/resources:copy_locales", 167 "//remoting/resources:copy_locales",
166 ] 168 ]
169 if (icu_use_data_file) {
170 deps += [ ":remote_assistance_host_resources" ]
171 }
167 } 172 }
168 173
169 if (enable_webrtc) { 174 if (enable_webrtc) {
170 deps += [ "//third_party/libjingle:libjingle_webrtc" ] 175 deps += [ "//third_party/libjingle:libjingle_webrtc" ]
171 } 176 }
172 177
173 if (is_desktop_linux) { 178 if (is_desktop_linux) {
174 deps += [ "//build/config/linux/gtk2" ] 179 deps += [ "//build/config/linux/gtk2" ]
175 } 180 }
176 } 181 }
177 } 182 }
178 } 183 }
OLDNEW
« 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