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
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 1485606..aee65da 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 f282f77..d68d33a 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 5b160eb..9991e73 100644
--- a/gyp/lua.gyp
+++ b/gyp/lua.gyp
@@ -69,7 +69,7 @@
],
[ 'skia_clang_build == 1', {
'cflags':[
- '-Wno-error',
+ '-w',
],
}],
],