No need to include ../tools/flags in include_dirs when depending on flags target.

"flags" target does it by direct_dependent_settings which exports the
include_dirs to targets that depend on it.

Along the way fixed the indentation of experimental.gyp and v8.gyp.

BUG=None
TEST=make all
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/343283002

gyp/experimental.gyp

@@ -23,44 +23,34 @@
       'target_name': 'SkiaExamples',
       'type': 'executable',
       'mac_bundle' : 1,
-      'include_dirs' : [
-        '../tools/flags',
-        ],
-      'includes': [],
       'sources': [
         '../experimental/SkiaExamples/SkExample.h',
         '../experimental/SkiaExamples/SkExample.cpp',
         '../experimental/SkiaExamples/HelloSkiaExample.cpp',
       ],
       'dependencies': [
+        'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
         'views.gyp:views',
         'xml.gyp:xml',
-         'flags.gyp:flags'
       ],
       'conditions' : [
         [ 'skia_gpu == 1', {
           'include_dirs' : [
-             '../src/gpu',  #gl/GrGLUtil.h
+            '../src/gpu',
-             ]
+          ],
         }],
         [ 'skia_os == "win"', {
           'sources' : [
             '../src/views/win/SkOSWindow_Win.cpp',
             '../src/views/win/skia_win.cpp',
           ],
-          },
+        }],
-        ],
-
         [ 'skia_os == "mac"', {
           'sources': [
-
-# SkiaExamples specific files
             '../experimental/SkiaExamples/SkiaExamples-Info.plist',
             '../experimental/SkiaExamples/SkExampleNSView.h',
             '../experimental/SkiaExamples/SkExampleNSView.mm',
-
-# Mac files
             '../src/views/mac/SampleAppDelegate.h',
             '../src/views/mac/SampleAppDelegate.mm',
             '../src/views/mac/SkEventNotifier.mm',
@@ -76,16 +66,13 @@
           'include_dirs' : [
             '../src/views/mac/'
           ],
-        'link_settings': {
-        },
           'xcode_settings' : {
             'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
           },
           'mac_bundle_resources' : [
             '../experimental/SkiaExamples/SkiaExamples.xib'
           ],
-        }
+        }],
-      ],
       ],
     }
   ],

gyp/flags.gyp

@@ -6,8 +6,8 @@
       'target_name': 'flags',
       'type': 'static_library',
       'sources': [
-        '../tools/flags/SkCommandLineFlags.h',
         '../tools/flags/SkCommandLineFlags.cpp',
+        '../tools/flags/SkCommandLineFlags.h',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',

gyp/pathops_unittest.gyp

@@ -16,7 +16,6 @@
         '../src/pdf',
         '../src/pipe/utils',
         '../src/utils',
-        '../tools/',
       ],
       'includes': [
         'pathops_unittest.gypi',
@@ -28,12 +27,12 @@
         '../tests/PathOpsOpLoopThreadedTest.cpp',
         '../tests/PathOpsSkpClipTest.cpp',
         '../tests/Test.cpp',
-        '../tests/skia_test.cpp',
         '../tests/Test.h',
+        '../tests/skia_test.cpp',
       ],
       'dependencies': [
-        'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
       ],
       'conditions': [
         [ 'skia_gpu == 1', {

gyp/tools.gyp

@@ -159,13 +159,12 @@
         '../tools/skpdiff/SkImageDiffer.cpp',
         '../tools/skpdiff/SkPMetric.cpp',
         '../tools/skpdiff/skpdiff_util.cpp',
-        '../tools/flags/SkCommandLineFlags.cpp',
       ],
       'include_dirs': [
-        '../tools/flags',
         '../src/core/', # needed for SkTLList.h
       ],
       'dependencies': [
+        'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
       'cflags': [
@@ -282,7 +281,6 @@
         '../tools/skpinfo.cpp',
       ],
       'include_dirs': [
-        '../tools/flags',
         '../src/core/',
       ],
       'dependencies': [
@@ -301,7 +299,6 @@
         '../src/core/',
         '../src/images',
         '../src/lazy',
-        '../tools/flags',
       ],
       'dependencies': [
         'flags.gyp:flags',

gyp/v8.gyp

@@ -6,20 +6,19 @@
       'type': 'executable',
       'mac_bundle' : 1,
       'include_dirs' : [
-        '../tools/flags',
         '../third_party/externals/v8/include',
       ],
       'sources': [
-         '../experimental/SkV8Example/SkV8Example.cpp',
-         '../experimental/SkV8Example/SkV8Example.h',
-         '../experimental/SkV8Example/Global.cpp',
-         '../experimental/SkV8Example/Global.h',
-         '../experimental/SkV8Example/Path2D.cpp',
-         '../experimental/SkV8Example/Path2D.h',
         '../experimental/SkV8Example/BaseContext.cpp',
         '../experimental/SkV8Example/BaseContext.h',
+        '../experimental/SkV8Example/Global.cpp',
+        '../experimental/SkV8Example/Global.h',
         '../experimental/SkV8Example/JsContext.cpp',
         '../experimental/SkV8Example/JsContext.h',
+        '../experimental/SkV8Example/Path2D.cpp',
+        '../experimental/SkV8Example/Path2D.h',
+        '../experimental/SkV8Example/SkV8Example.cpp',
+        '../experimental/SkV8Example/SkV8Example.h',
       ],
       'dependencies': [
         'flags.gyp:flags',
@@ -50,7 +49,7 @@
       'conditions' : [
         [ 'skia_gpu == 1', {
           'include_dirs' : [
-             '../src/gpu',  #gl/GrGLUtil.h
+            '../src/gpu',
           ]
         }],
         [ 'skia_os == "win"', {
@@ -58,12 +57,9 @@
             '../src/views/win/SkOSWindow_Win.cpp',
             '../src/views/win/skia_win.cpp',
           ],
-          },
+        }],
-        ],
-
         [ 'skia_os == "mac"', {
           'sources': [
-
             '../src/views/mac/SampleAppDelegate.h',
             '../src/views/mac/SampleAppDelegate.mm',
             '../src/views/mac/SkEventNotifier.mm',
@@ -85,8 +81,7 @@
           'mac_bundle_resources' : [
             '../experimental/SkiaExamples/SkiaExamples.xib'
           ],
-        }
+        }],
-      ],
       ],
     }
   ],