Refactor how we handle resources path in Tests.

This idea emerged while doing https://codereview.chromium.org/321723002/
(commit 880914c35c8f7fc2e9c57134134c883baf66e538).

BUG=None
TEST=make tests && out/Debug/tests
R=mtklein@google.com

Author: tfarina@chromium.org

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

6 files changed, 43 insertions, 16 deletions

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index d4dda70049..abfc8b77f9 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -19,7 +19,6 @@
         '../samplecode', # To pull SampleApp.h and SampleCode.h
         '../src/pipe/utils', # For TiledPipeController
         '../src/utils/debugger',
-        '../tools',
       ],
       'includes': [
         'gmslides.gypi',
@@ -135,7 +134,7 @@
         # Lua
         '../src/utils/SkLuaCanvas.cpp',
         '../src/utils/SkLua.cpp',
-        
+
         # tools
         '../tools/sk_tool_utils.cpp',
       ],
@@ -145,15 +144,17 @@
         '../samplecode/SampleFontCache.cpp',
       ],
       'dependencies': [
-        'skia_lib.gyp:skia_lib',
-        'views.gyp:views',
         'animator.gyp:animator',
-        'xml.gyp:xml',
+        'etc1.gyp:libetc1',
         'experimental.gyp:experimental',
+        'flags.gyp:flags',
+        'lua.gyp:lua',
         'pdf.gyp:pdf',
+        'resources.gyp:resources',
+        'skia_lib.gyp:skia_lib',
+        'views.gyp:views',
         'views_animated.gyp:views_animated',
-        'lua.gyp:lua',
-        'etc1.gyp:libetc1',
+        'xml.gyp:xml',
       ],
      'conditions' : [
        [ 'sample_pdf_file_viewer == 1', {
diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index a5e0cd6918..6ec972f328 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -14,6 +14,7 @@
         'etc1.gyp:libetc1',
         'flags.gyp:flags',
         'jsoncpp.gyp:jsoncpp',
+        'resources.gyp:resources',
         'skia_lib.gyp:skia_lib',
       ],
       'sources': [
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index fd8f74d621..0b0054b701 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -31,11 +31,10 @@
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
-        '../src/images',
         '../src/effects',
-        '../src/pipe/utils/',
-        '../src/utils/',
-        '../tools',
+        '../src/images',
+        '../src/pipe/utils',
+        '../src/utils',
       ],
       'includes': [
         'gmslides.gypi',
@@ -48,12 +47,13 @@
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'dependencies': [
-        'skia_lib.gyp:skia_lib',
+        'etc1.gyp:libetc1',
         'flags.gyp:flags',
         'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'pdf.gyp:pdf',
-        'etc1.gyp:libetc1',
+        'resources.gyp:resources',
+        'skia_lib.gyp:skia_lib',
       ],
       'conditions': [
         ['skia_android_framework', {
diff --git a/gyp/resources.gyp b/gyp/resources.gyp
new file mode 100644
index 0000000000..48e96c3cc5
--- /dev/null
+++ b/gyp/resources.gyp
@@ -0,0 +1,25 @@
+# Copyright 2014 Google Inc.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'resources',
+      'type': 'static_library',
+      'sources': [
+        '../tools/Resources.cpp',
+        '../tools/Resources.h',
+      ],
+      'dependencies': [
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../tools/',
+        ],
+      },
+    },
+  ]
+}
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index 556143f279..2a7dddd4ff 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -11,17 +11,17 @@
     '../src/pipe/utils',
     '../src/utils',
     '../src/utils/debugger',
-    '../tools/',
 
     # Needed for TDStackNesterTest.
     '../experimental/PdfViewer',
     '../experimental/PdfViewer/src',
   ],
   'dependencies': [
-    'skia_lib.gyp:skia_lib',
     'experimental.gyp:experimental',
     'flags.gyp:flags',
     'pdf.gyp:pdf',
+    'resources.gyp:resources',
+    'skia_lib.gyp:skia_lib',
     'tools.gyp:picture_utils',
   ],
   'sources': [
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 9cea4617e1..7af70f782f 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -476,7 +476,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-        '../tools/',
+          '../tools/',
         ],
       },
     },