add direct_dependencies for picture_utils, and add cflags_cc for android's gypi

trunk/gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       # Build all executable targets defined below.
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
         'bench_pictures',
         'filter',
-#        'lua_pictures',
+        'lua_pictures',
         'pinspect',
         'render_pdfs',
         'render_pictures',
         'skdiff',
         'skhello',
         'skimage',
       ],
     },
     {
       'target_name': 'skdiff',
@@ skipping 222 matching lines @@
     {
       'target_name': 'picture_utils',
       'type': 'static_library',
       'sources': [
         '../tools/picture_utils.cpp',
         '../tools/picture_utils.h',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+        '../tools/picture_utils.h',
+        ],
+      },
     },
     {
       'target_name': 'pinspect',
       'type': 'executable',
       'sources': [
         '../tools/pinspect.cpp',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
@@ skipping 58 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: