Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 99b336a99c9a2216ffd26a15419377a5c4104533..df6ccc6b9dbeb0863fd4eb0dc123a9ee9ec9bf33 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -35,6 +35,9 @@ |
# Configure the build for small devices. See crbug.com/318413 |
'embedded%': 0, |
+ |
+ # Use aurax11 for clipboard implementation. This is true on linux_aura. |
+ 'use_clipboard_aurax11%': 0, |
tony
2013/12/12 17:38:20
You don't need to define this at the deepest nesti
|
}, |
# Copy conditionally-set variables out one scope. |
'chromeos%': '<(chromeos)', |
@@ -43,6 +46,7 @@ |
'use_cras%': '<(use_cras)', |
'use_ozone%': '<(use_ozone)', |
'embedded%': '<(embedded)', |
+ 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', |
# Whether we are using Views Toolkit |
'toolkit_views%': 0, |
@@ -122,6 +126,7 @@ |
'use_ash%': '<(use_ash)', |
'use_cras%': '<(use_cras)', |
'use_ozone%': '<(use_ozone)', |
+ 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', |
tony
2013/12/12 17:38:20
I think this is the first depth you need to define
|
'embedded%': '<(embedded)', |
'use_openssl%': '<(use_openssl)', |
'enable_viewport%': '<(enable_viewport)', |
@@ -236,6 +241,7 @@ |
'use_cras%': '<(use_cras)', |
'use_ozone%': '<(use_ozone)', |
'use_ozone_evdev%': '<(use_ozone_evdev)', |
+ 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', |
'embedded%': '<(embedded)', |
'use_openssl%': '<(use_openssl)', |
'enable_viewport%': '<(enable_viewport)', |
@@ -548,6 +554,10 @@ |
'use_x11%': 1, |
}], |
+ ['OS=="linux" and use_aura==1 and chromeos==0', { |
+ 'use_clipboard_aurax11%': 1, |
+ }], |
+ |
# Flags to use glib. |
['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { |
'use_glib%': 0, |
@@ -888,6 +898,7 @@ |
'use_cairo%': '<(use_cairo)', |
'use_ozone%': '<(use_ozone)', |
'use_ozone_evdev%': '<(use_ozone_evdev)', |
+ 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', |
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
'desktop_linux%': '<(desktop_linux)', |
'use_x11%': '<(use_x11)', |
@@ -2133,6 +2144,9 @@ |
['use_x11==1', { |
'defines': ['USE_X11=1'], |
}], |
+ ['use_clipboard_aurax11==1', { |
+ 'defines': ['USE_CLIPBOARD_AURAX11=1'], |
+ }], |
['enable_one_click_signin==1', { |
'defines': ['ENABLE_ONE_CLICK_SIGNIN'], |
}], |