Separate our jsoncpp dependency from Chromium's jsoncpp overrides.

BUG=https://code.google.com/p/skia/issues/detail?id=909
Review URL: https://codereview.appspot.com/7098047

git-svn-id: http://skia.googlecode.com/svn/trunk@7187 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 21 insertions, 20 deletions

diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index 34f05e5fd0..1ee33fdb96 100644
--- a/gyp/jsoncpp.gyp
+++ b/gyp/jsoncpp.gyp
@@ -3,12 +3,13 @@
 # found in the LICENSE file.
 
 # TODO: This file was copied from the external dependency
-# third_party/externals/jsoncpp/jsoncpp.gyp , at revision 125399,
+# third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399,
 # with directory paths modified to work at this level.
 #
 # It would be better for us to depend on that gypfile within the external
 # dependency, but so far we have been unable to make that work reliably.
 # See https://code.google.com/p/skia/issues/detail?id=1023
+# and https://code.google.com/p/skia/source/detail?r=7115
 
 {
   'targets': [
@@ -19,30 +20,30 @@
         'JSON_USE_EXCEPTION=0',
       ],
       'sources': [
-        '../third_party/externals/jsoncpp/source/include/json/assertions.h',
-        '../third_party/externals/jsoncpp/source/include/json/autolink.h',
-        '../third_party/externals/jsoncpp/source/include/json/config.h',
-        '../third_party/externals/jsoncpp/source/include/json/features.h',
-        '../third_party/externals/jsoncpp/source/include/json/forwards.h',
-        '../third_party/externals/jsoncpp/source/include/json/json.h',
-        '../third_party/externals/jsoncpp/source/include/json/reader.h',
-        '../third_party/externals/jsoncpp/overrides/include/json/value.h',
-        '../third_party/externals/jsoncpp/source/include/json/writer.h',
-        '../third_party/externals/jsoncpp/source/src/lib_json/json_batchallocator.h',
-        '../third_party/externals/jsoncpp/source/src/lib_json/json_reader.cpp',
-        '../third_party/externals/jsoncpp/source/src/lib_json/json_tool.h',
-        '../third_party/externals/jsoncpp/overrides/src/lib_json/json_value.cpp',
-        '../third_party/externals/jsoncpp/source/src/lib_json/json_writer.cpp',
+        '../third_party/externals/jsoncpp/include/json/assertions.h',
+        '../third_party/externals/jsoncpp/include/json/autolink.h',
+        '../third_party/externals/jsoncpp/include/json/config.h',
+        '../third_party/externals/jsoncpp/include/json/features.h',
+        '../third_party/externals/jsoncpp/include/json/forwards.h',
+        '../third_party/externals/jsoncpp/include/json/json.h',
+        '../third_party/externals/jsoncpp/include/json/reader.h',
+        '../third_party/externals/jsoncpp-chromium/overrides/include/json/value.h',
+        '../third_party/externals/jsoncpp/include/json/writer.h',
+        '../third_party/externals/jsoncpp/src/lib_json/json_batchallocator.h',
+        '../third_party/externals/jsoncpp/src/lib_json/json_reader.cpp',
+        '../third_party/externals/jsoncpp/src/lib_json/json_tool.h',
+        '../third_party/externals/jsoncpp-chromium/overrides/src/lib_json/json_value.cpp',
+        '../third_party/externals/jsoncpp/src/lib_json/json_writer.cpp',
       ],
       'include_dirs': [
-        '../third_party/externals/jsoncpp/overrides/include/',
-        '../third_party/externals/jsoncpp/source/include/',
-        '../third_party/externals/jsoncpp/source/src/lib_json/',
+        '../third_party/externals/jsoncpp-chromium/overrides/include/',
+        '../third_party/externals/jsoncpp/include/',
+        '../third_party/externals/jsoncpp/src/lib_json/',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../third_party/externals/jsoncpp/overrides/include/',
-          '../third_party/externals/jsoncpp/source/include/',
+          '../third_party/externals/jsoncpp-chromium/overrides/include/',
+          '../third_party/externals/jsoncpp/include/',
         ],
       },
       'conditions': [