diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:10:46 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:10:46 +0000 |
| commit | 34baed11c7ddfa0bc48a7998f9e63c5613fc6579 (patch) | |
| tree | cb8a42cc9c0c3ee464fb996e9d39dac1b7145c0d /skia/skia.gyp | |
| parent | 281bc5ba1878f3c4b9c638e89d73aa5549b20d76 (diff) | |
| download | chromium_src-34baed11c7ddfa0bc48a7998f9e63c5613fc6579.zip chromium_src-34baed11c7ddfa0bc48a7998f9e63c5613fc6579.tar.gz chromium_src-34baed11c7ddfa0bc48a7998f9e63c5613fc6579.tar.bz2 | |
Avoid redefining HAVE_ENDIAN_H and HAVE_OFF64_T on Android
These are already provided by
system/core/include/arch/linux-arm/AndroidConfig.h and cause warnings when
redefined.
Review URL: https://chromiumcodereview.appspot.com/10696007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 3ea140b..4697b3c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -929,7 +929,6 @@ 'conditions': [ [ '_toolset == "target"', { 'defines': [ - 'HAVE_ENDIAN_H', 'HAVE_PTHREADS', 'OS_ANDROID', 'USE_CHROMIUM_SKIA', @@ -960,6 +959,11 @@ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', ], }], + [ '_toolset == "target" and android_build_type == 0', { + 'defines': [ + 'HAVE_ENDIAN_H', + ], + }], [ '_toolset=="host" and host_os=="linux"', { 'sources': [ 'ext/platform_device_linux.cc', @@ -1070,7 +1074,6 @@ 'conditions': [ [ '_toolset == "target"', { 'defines': [ - 'HAVE_ENDIAN_H', 'SK_RELEASE', # Assume platform has a release build. ], 'dependencies!': [ @@ -1078,6 +1081,11 @@ '../third_party/zlib/zlib.gyp:zlib', ], }], + [ '_toolset == "target" and android_build_type == 0', { + 'defines': [ + 'HAVE_ENDIAN_H', + ], + }], ], }], ['OS=="mac"', { |