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_variables.gypi b/gyp/common_variables.gypi
index d02d465..c3ec7d8 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -57,8 +57,10 @@
'conditions': [
[ 'skia_android_framework == 1', {
'skia_os%': 'android',
+ 'skia_chrome_utils%': 0,
}, {
'skia_os%': '<(skia_os)',
+ 'skia_chrome_utils%': 1,
}],
[ 'skia_os == "win"', {
'os_posix%': 0,
@@ -99,7 +101,6 @@
'skia_resource_cache_mb_limit%': 0,
'skia_resource_cache_count_limit%': 0,
'skia_angle%': 0,
- 'skia_chrome_utils%': 1,
'skia_directwrite%': 0,
'skia_gpu%': 1,
'skia_osx_deployment_target%': '',