Small fixes for auto generating Android.mk
Turn off -Wno-c++11-extensions for Android. The Android framework does
not support this flag. Using it gives a bunch of warnings when building,
so remove it.
Remove skia_chrome_utils from framework. They are experimental and not
used by Android.
BUG=skia:1975
R=djsollen@google.com, robertphillips@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/164793002
git-svn-id: http://skia.googlecode.com/svn/trunk@13475 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index fb97bb2..48f8e19 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -130,13 +130,18 @@
'-Wpointer-arith',
'-Wno-unused-parameter',
- '-Wno-c++11-extensions',
],
'cflags_cc': [
'-fno-rtti',
'-Wnon-virtual-dtor',
],
'conditions': [
+ [ 'skia_android_framework==0', {
+ 'cflags': [
+ # This flag is not supported by Android build system.
+ '-Wno-c++11-extensions',
+ ],
+ }],
[ 'skia_warnings_as_errors', {
'cflags': [
'-Werror',