Run athena on chrome

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 188b1acc58b1d0559b0b60cc39ec8fd12ff08344..1f999931738fefb4a7668371b05c23458cc267f8 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)',
@@ -1061,6 +1067,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)',
@@ -2555,6 +2562,9 @@
       ['use_ash==1', {
         'defines': ['USE_ASH=1'],
       }],
+      ['use_athena==1', {
+        'defines': ['USE_ATHENA=1'],
+      }],

[sadrul, 2014/08/29 00:05:20]

Would you mind moving this into chrome.gyp so that we don't accidentally use
USE_ATHENA outside of chrome/?

[oshima, 2014/08/29 17:19:24]

I will follow OWNERS recommendation here too.

[oshima, 2014/08/29 22:11:19]

sky@, I agree that this is probably better, but want to check your opinion.

       ['use_pango==1', {
         'defines': ['USE_PANGO=1'],
       }],