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 (file)
--- 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',

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index d02d465..c3ec7d8 100644 (file)
--- 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%': '',