commit e52d2911a15d9b0e8292363d593afab0c94e63b6
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 15 20:01:07 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed May 15 20:01:07 2013 +0000
tree 68b3b6ee7bc632aa92ebb44fdb588935a602615d
parent 04df4732b7e44250b62780aa29435681639f4afa

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@9152 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 81c958a..fda1222 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/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': [