diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 15:22:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 15:22:26 +0000 |
| commit | 93f5e5162137553c5fb81f69fa682a5dfe7eaef1 (patch) | |
| tree | 0afa1a03fb2cefe3be5c3142bdf3fa57f5917cda | |
| parent | 0abc8928cdb7e75d73d1bed7ac5b4f28316905d0 (diff) | |
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
| -rw-r--r-- | gyp/common_conditions.gypi | 7 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index fb97bb2faf..48f8e19d03 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', diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index d02d465087..c3ec7d8ce6 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%': '', |