diff options
| author | Dominic Mazzoni <dmazzoni@chromium.org> | 2015-03-16 13:51:09 -0700 |
|---|---|---|
| committer | Dominic Mazzoni <dmazzoni@chromium.org> | 2015-03-16 20:54:11 +0000 |
| commit | 0e9bcce45c12479259c705a07a6b4b1e73b84bf2 (patch) | |
| tree | baf231cb4ce2f6dadc976db8cce21d564071e82c /build/linux | |
| parent | 772e590605971ee9c165e4ffdfec844edaf017f8 (diff) | |
| download | chromium_src-0e9bcce45c12479259c705a07a6b4b1e73b84bf2.zip chromium_src-0e9bcce45c12479259c705a07a6b4b1e73b84bf2.tar.gz chromium_src-0e9bcce45c12479259c705a07a6b4b1e73b84bf2.tar.bz2 | |
Re-land: Resurrect Aura Linux accessibility.
1. Avoids overloading in a C linkage block (mostynb)
2. Only compiles ATK support if use_x11 is true
to avoid ChromeCast issue (gunsch)
3. Updates chrome/installer/linux expectations
Original changelist: https://codereview.chromium.org/975113002/
BUG=463671
R=thestig@chromium.org
TBR=dpranke, plundblad, sky
Review URL: https://codereview.chromium.org/1005293002
Cr-Commit-Position: refs/heads/master@{#320790}
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 59fc13a..5333798 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -91,6 +91,30 @@ # added back to Chrome OS and Ozone. Don't try to use GTK on Chrome OS and Ozone. 'targets': [ { + 'target_name': 'atk', + 'type': 'none', + 'conditions': [ + ['_toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags atk)', + ], + 'defines': [ + 'ATK_LIB_DIR="<!@(<(pkg-config) --variable=libdir atk)"', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other atk)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l atk)', + ], + }, + }], + ], + }, + { 'target_name': 'gdk', 'type': 'none', 'conditions': [ |