diff options
| author |  djsollen <djsollen@google.com> | 2016-04-25 11:45:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-25 11:45:35 -0700 |
| commit | 460f40507e5dfb1324681b4b1cbe7b431f69e668 (patch) | |
| tree | 666614188cb763b72635005323285390147b6c81 | |
| parent | 68758aed88b16d67658f634e8dcd855404fedb8a (diff) | |
Make clang the default Android compiler.
BUG=skia:5215
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1919873003
Review URL: https://codereview.chromium.org/1919873003
| -rw-r--r-- | gyp/common_conditions.gypi | 9 | ||||
| -rw-r--r-- | gyp/freetype.gyp | 2 | ||||
| -rw-r--r-- | gyp/lua.gyp | 2 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 1485606f1b..aee65daf42 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -620,11 +620,14 @@ 'SK_GAMMA_SRGB', ], 'configurations': { - 'Debug': { - 'cflags': ['-g'] - }, 'Release': { 'cflags': ['-O2'], + 'conditions': [ + [ 'skia_clang_build', { + 'cflags!': ['-g'], + 'cflags': [ '-gline-tables-only' ], + }], + ], }, }, 'libraries': [ diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index f282f77cf7..d68d33ad97 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -104,7 +104,7 @@ }], [ 'skia_clang_build == 1', { 'cflags':[ - '-Wno-error', + '-w', ], }], ], diff --git a/gyp/lua.gyp b/gyp/lua.gyp index 5b160eb379..9991e7343c 100644 --- a/gyp/lua.gyp +++ b/gyp/lua.gyp @@ -69,7 +69,7 @@ ], [ 'skia_clang_build == 1', { 'cflags':[ - '-Wno-error', + '-w', ], }], ], diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 0084fc6bb7..ee1160e6fa 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -12,7 +12,7 @@ set -e BUILDTYPE=${BUILDTYPE-Debug} -USE_CLANG="false" +USE_CLANG="true" while (( "$#" )); do if [[ "$1" == "-d" ]]; then |