Generate bench/Android.mk from gyp.

For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.

bench/DeferredSurfaceCopyBench.cpp:
Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly.

bench/ResultsWriter.h:
bench/benchmain.cpp:
Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined,
which is the case for the Android framework build.

gyp/bench.gyp:
Depend on skia and cutils (for android_atomic_inc etc).

gyp/common_conditions.gypi:
Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set.

gyp/common_variables.gypi:
Add a flag for skia_build_json_writer, and set it only when
skia_android_framework is not set.

gyp/jsoncpp.gyp:
Do not build jsoncpp when skia_build_json_writer is not defined.
include/utils/SkJSONCPP.h:
Do not include json headers when SK_BUILD_JSON_WRITER is not defined.

platform_tools/android/bin/gyp_to_android.py:
Generate bench/Android.mk.

platform_tools/android/gyp_gen/gypd_parser.py:
Skip dest_dir when checking for include_dirs.

platform_tools/android/gyp_gen/makefile_writer.py:
Build bench/Android.mk when building external/skia.

platform_tools/android/gyp_gen/tool_makefile_writer.py:
Add a parameter for putting the binary into /data/local/tmp.

BUG=skia:2447
BUG=skia:2448
R=halcanary@google.com, reed@google.com

Author: scroggo@google.com

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

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

4 files changed, 55 insertions, 32 deletions

diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 9e8d1d714b..553c0e72cd 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -33,6 +33,14 @@
             ],
           },
         ],
+        ['skia_android_framework == 1',
+          {
+            'libraries': [
+              '-lskia',
+              '-lcutils',
+            ],
+          },
+        ],
       ],
       'includes': [
         'bench.gypi',
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 6a800b48ef..4a60cd0502 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -639,6 +639,12 @@
       ],
     }],
 
+    [ 'skia_build_json_writer', {
+      'defines': [
+        'SK_BUILD_JSON_WRITER',
+      ]
+    }],
+
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index b6d4e76af4..033073f447 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -60,9 +60,13 @@
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
+          # FIXME (scroggo): JSON is disabled in Android framework until we
+          # solve skbug.com/2448
+          'skia_build_json_writer%': 0,
         }, {
           'skia_os%': '<(skia_os)',
           'skia_chrome_utils%': 1,
+          'skia_build_json_writer%': 1,
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
@@ -198,6 +202,7 @@
     'skia_mesa%': '<(skia_mesa)',
     'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
     'skia_android_framework%': '<(skia_android_framework)',
+    'skia_build_json_writer%': '<(skia_build_json_writer)',
     'skia_android_path_rendering%': '<(skia_android_path_rendering)',
     'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
     'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
index 1b5b7845e8..0507ed06a1 100644
--- a/gyp/jsoncpp.gyp
+++ b/gyp/jsoncpp.gyp
@@ -19,38 +19,42 @@
     {
       'target_name': 'jsoncpp',
       'type': 'static_library',
-      'defines': [
-        'JSON_USE_EXCEPTION=0',
-      ],
-      'sources': [
-        '../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-chromium/overrides/include/',
-        '../third_party/externals/jsoncpp/include/',
-        '../third_party/externals/jsoncpp/src/lib_json/',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/jsoncpp-chromium/overrides/include/',
-          '../third_party/externals/jsoncpp/include/',
-        ],
-      },
-      'cflags': [
-        '-w',
+      'conditions': [
+        ['skia_build_json_writer', {
+          'defines': [
+            'JSON_USE_EXCEPTION=0',
+          ],
+          'sources': [
+            '../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-chromium/overrides/include/',
+            '../third_party/externals/jsoncpp/include/',
+            '../third_party/externals/jsoncpp/src/lib_json/',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '../third_party/externals/jsoncpp-chromium/overrides/include/',
+              '../third_party/externals/jsoncpp/include/',
+            ],
+          },
+          'cflags': [
+            '-w',
+          ],
+        }],
       ],
     },
   ],