Generate bench/Android.mk from gyp.
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 16 May 2014 13:15:41 +0000 (13:15 +0000)
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 16 May 2014 13:15:41 +0000 (13:15 +0000)
commit61744ec1d2b0e287a652a419dac285c6a803e270
treeacc84ed655a85ad418a877fccfb2807add466c00
parent69031a44273ccb7656df88c6bcb7b62f4d2731bb
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
12 files changed:
bench/DeferredSurfaceCopyBench.cpp
bench/ResultsWriter.h
bench/benchmain.cpp
gyp/bench.gyp
gyp/common_conditions.gypi
gyp/common_variables.gypi
gyp/jsoncpp.gyp
include/utils/SkJSONCPP.h
platform_tools/android/bin/gyp_to_android.py
platform_tools/android/gyp_gen/gypd_parser.py
platform_tools/android/gyp_gen/makefile_writer.py
platform_tools/android/gyp_gen/tool_makefile_writer.py