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

Unified Diff: build/common.gypi

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments, rebase Created 6 years, 3 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 | « athena/resource_manager/public/resource_manager_delegate.h ('k') | chrome/browser/DEPS » ('j') | no next file with comments »
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 71d96946c23dc04ce226b9944096b741a770b2dc..1b867f5753c93099dff0ed7f0a65bed8a4181ea6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -30,6 +30,9 @@
# Whether or not we are building the Ash shell.
'use_ash%': 0,
+ # Whether or not we are building the Athena shell.
+ 'use_athena%': 0,
+
# Whether or not we are using CRAS, the ChromeOS Audio Server.
'use_cras%': 0,
@@ -53,6 +56,7 @@
'chromecast%': '<(chromecast)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'embedded%': '<(embedded)',
@@ -133,6 +137,7 @@
'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'embedded%': '<(embedded)',
@@ -271,6 +276,7 @@
'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_ozone_evdev%': '<(use_ozone_evdev)',
@@ -1065,6 +1071,7 @@
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_openssl%': '<(use_openssl)',
'use_openssl_certs%': '<(use_openssl_certs)',
@@ -2563,6 +2570,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
+ ['use_athena==1', {
+ 'defines': ['USE_ATHENA=1'],
+ }],
['use_pango==1', {
'defines': ['USE_PANGO=1'],
}],
« no previous file with comments | « athena/resource_manager/public/resource_manager_delegate.h ('k') | chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698