61744ec1d2
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
62 lines
2.5 KiB
Python
62 lines
2.5 KiB
Python
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# TODO: This file was copied from the external dependency
|
|
# 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
|
|
|
|
{
|
|
'variables': {
|
|
'skia_warnings_as_errors': 0,
|
|
},
|
|
'targets': [
|
|
{
|
|
'target_name': 'jsoncpp',
|
|
'type': 'static_library',
|
|
'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',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}
|