summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@chromium.org>2014-09-05 15:13:34 -0400
committerSadrul Habib Chowdhury <sadrul@chromium.org>2014-09-05 19:17:26 +0000
commitec96ebfa63de8e17aaf9ec496a5c70c0e085edb7 (patch)
tree3ffba207b1796f4c97e6f31b0d28394558db69e6 /chrome/chrome_browser.gypi
parent5c361bce306a985bcb65cd9db6060ccbe139f66d (diff)
downloadchromium_src-ec96ebfa63de8e17aaf9ec496a5c70c0e085edb7.zip
chromium_src-ec96ebfa63de8e17aaf9ec496a5c70c0e085edb7.tar.gz
chromium_src-ec96ebfa63de8e17aaf9ec496a5c70c0e085edb7.tar.bz2
athena: Move the USE_ATHENA define into //chrome.
Switching the use_athena gyp-flag only affects the code inside //chrome. So move the USE_ATHENA inside //chrome so that toggling the flag doesn't cause all targets to be rebuilt, and only code inside //chrome is rebuilt instead. This should also prevent accidental dependence on USE_ATHENA in code outside of //chrome. BUG=none R=oshima@chromium.org Review URL: https://codereview.chromium.org/541983002 Cr-Commit-Position: refs/heads/master@{#293566}
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 638df70..e48b74e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2956,6 +2956,11 @@
# chrome/browser/metrics/variations/generate_resources_map.py
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/generated_resources_map.cc',
],
+ 'conditions': [
+ ['use_athena==1', {
+ 'defines': ['USE_ATHENA=1'],
+ }],
+ ],
'defines': [
'<@(nacl_defines)',
],