diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-09-24 17:27:50 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-09-25 00:28:35 +0000 |
| commit | 4789b6a08a408b687ef8015cd3a760f0b2b08386 (patch) | |
| tree | 7d6c60c5669ffba3ff0e31b9ca331da8adf83218 /build | |
| parent | 673cf0160d7b5e520841a65f4425f8be1a48fbb1 (diff) | |
| download | chromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.zip chromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.tar.gz chromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.tar.bz2 | |
Fix ChromeOS Ozone build since it doesn't have xdisplaycheck.
BUG=414808
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/599863003
Cr-Commit-Position: refs/heads/master@{#296590}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/gtest/setup.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index fe152bf..6a9e65b 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -121,6 +121,7 @@ def _GenerateDepsDirUsingIsolate(suite_name, isolate_file_path=None): # TODO(maruel): This may not be always true. '--config-variable', 'target_arch', 'arm', '--config-variable', 'use_openssl', '0', + '--config-variable', 'use_ozone', '0', ] assert not cmd_helper.RunCmd(isolate_cmd) diff --git a/build/isolate.gypi b/build/isolate.gypi index 95d6926..5217c31 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -101,6 +101,7 @@ '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'target_arch=<(target_arch)', + '--config-variable', 'use_ozone=<(use_ozone)', ], 'conditions': [ # Note: When gyp merges lists, it appends them to the old value. |