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

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 81c958a9e3f1c65513a451ef6b4a23e7268ee330..fda122212c74689b6dbde46407e5bbb723503b53 100644 (file)
--- 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': [

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index e28991eb9bc7cbf554c2defb8b902a6d19fb8093..3cc70df220c3ce7d087b440262f6e71bd66f816a 100644 (file)
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -15,7 +15,7 @@
       'dependencies': [
         'bench_pictures',
         'filter',
-#        'lua_pictures',
+        'lua_pictures',
         'pinspect',
         'render_pdfs',
         'render_pictures',
@@ -258,6 +258,11 @@
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+        '../tools/picture_utils.h',
+        ],
+      },
     },
     {
       'target_name': 'pinspect',