summaryrefslogtreecommitdiff
path: root/common_conditions.gypi
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-15 20:01:07 +0000
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-15 20:01:07 +0000
commitb7f18aa0a2dba78e42ad7bb5448acfd858730167 (patch)
tree6217a2896a3420809f4d1f625df6834d1b3097f5 /common_conditions.gypi
parent1a07951934a64b3fc9fdcc9fe67eca6aa13e66c2 (diff)
downloadgyp-b7f18aa0a2dba78e42ad7bb5448acfd858730167.tar.gz
add direct_dependencies for picture_utils, and add cflags_cc for android's gypi
Review URL: https://codereview.chromium.org/14620020 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9152 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common_conditions.gypi')
-rw-r--r--common_conditions.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 81c958a..fda1222 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -311,10 +311,12 @@
'cflags': [
'-Wall',
'-fno-exceptions',
- '-fno-rtti',
'-fstrict-aliasing',
'-fuse-ld=gold',
],
+ 'cflags_cc': [
+ '-fno-rtti',
+ ],
'conditions': [
[ 'skia_warnings_as_errors', {
'cflags': [