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

Unified Diff: build/common.gypi

Issue 1412863004: arc-bridge: Add the ARC Bridge Service (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Moved chromeos/arc/bridge/common to components/arc/common Created 5 years, 1 month 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 | build/config/BUILD.gn » ('j') | components/arc.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9f2f91ad20e14c5ab3406debd21f85bc5eb70d36..bc5f890f91ec78c8e6bcbef1d2c8af0424fb4428 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1545,6 +1545,9 @@
'libjpeg_ijg_gyp_path': '<(DEPTH)/third_party/libjpeg/libjpeg.gyp',
'libjpeg_turbo_gyp_path': '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp',
+ # ARC instance disabled by default.
+ 'enable_arc%': 0,
+
'conditions': [
['buildtype=="Official"', {
# Continue to embed build meta data in Official builds, basically the
@@ -3076,6 +3079,9 @@
# TODO: Enable on Windows too, http://crbug.com/404525
'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
}],
+ ['<(enable_arc)==1', {
+ 'defines': ['ENABLE_ARC=1'],
+ }],
['chromium_code==0', {
'variables': {
'clang_warning_flags': [
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | components/arc.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698