diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-27 19:00:24 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 13:49:49 +0100 |
| commit | 2c74e8a2e6fcffbe5726675cfa5b90ea003880c6 (patch) | |
| tree | 469f7d1b333507b0a3468e9d59637c9b4b2a07b3 /build | |
| parent | ccd2a327ddc30d88ba94396ffbd7dd8eeeccb0e2 (diff) | |
| download | external_chromium-2c74e8a2e6fcffbe5726675cfa5b90ea003880c6.zip external_chromium-2c74e8a2e6fcffbe5726675cfa5b90ea003880c6.tar.gz external_chromium-2c74e8a2e6fcffbe5726675cfa5b90ea003880c6.tar.bz2 | |
Do not define USE_X11 for Android
USE_X11 should never be defined for Android, this will fix a problem
in the upcoming merge.
There should be no behavior change as we don't have any headers
from X11.
Change-Id: I6417087961ab376d1bc73ef356388b4d7166c120
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/build_config.h b/build/build_config.h index 35b1ddf..0cf08b3 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -58,7 +58,11 @@ #if !defined(USE_OPENSSL) #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. #endif +#if !defined(ANDROID) #define USE_X11 1 // Use X for graphics. +#else +#undef USE_X11 +#endif #endif #if defined(USE_OPENSSL) && defined(USE_NSS) |