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

Side by Side Diff: chrome/common/BUILD.gn

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment out CheckEnvVar Created 5 years, 10 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 | « chrome/chrome_common.gypi ('k') | chrome/renderer/pepper/pepper_uma_host.cc » ('j') | 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("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 6
7 gypi_values = exec_script("//build/gypi_to_gn.py", 7 gypi_values = exec_script("//build/gypi_to_gn.py",
8 [ rebase_path("../chrome_common.gypi") ], 8 [ rebase_path("../chrome_common.gypi") ],
9 "scope", 9 "scope",
10 [ "../chrome_common.gypi" ]) 10 [ "../chrome_common.gypi" ])
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 deps += [ 200 deps += [
201 "//third_party/mach_override", 201 "//third_party/mach_override",
202 "//third_party/google_toolbox_for_mac", 202 "//third_party/google_toolbox_for_mac",
203 ] 203 ]
204 } 204 }
205 205
206 if (enable_plugins) { 206 if (enable_plugins) {
207 sources += [ 207 sources += [
208 "pepper_flash.cc", 208 "pepper_flash.cc",
209 "pepper_flash.h", 209 "pepper_flash.h",
210 ]
211 deps += [ "//third_party/adobe/flash:flapper_version_h" ]
212 }
213 if (enable_plugins && enable_extensions) {
214 sources += [
210 "pepper_permission_util.cc", 215 "pepper_permission_util.cc",
211 "pepper_permission_util.h", 216 "pepper_permission_util.h",
212 ] 217 ]
213 deps += [ "//third_party/adobe/flash:flapper_version_h" ]
214 } 218 }
215 if (!enable_webrtc) { 219 if (!enable_webrtc) {
216 sources -= [ "media/webrtc_logging_messages.h" ] 220 sources -= [ "media/webrtc_logging_messages.h" ]
217 } 221 }
218 if (enable_configuration_policy) { 222 if (enable_configuration_policy) {
219 deps += [ "//components/policy" ] 223 deps += [ "//components/policy" ]
220 } 224 }
221 225
222 if (safe_browsing_mode == 1) { 226 if (safe_browsing_mode == 1) {
223 defines += [ "FULL_SAFE_BROWSING" ] 227 defines += [ "FULL_SAFE_BROWSING" ]
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 ] 304 ]
301 } 305 }
302 306
303 if (enable_extensions) { 307 if (enable_extensions) {
304 sources += [ 308 sources += [
305 "extensions/extension_test_util.cc", 309 "extensions/extension_test_util.cc",
306 "extensions/extension_test_util.h", 310 "extensions/extension_test_util.h",
307 ] 311 ]
308 } 312 }
309 } 313 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/renderer/pepper/pepper_uma_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698