Generate bench/Android.mk from gyp.

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
Committed: http://code.google.com/p/skia/source/detail?r=14760

[scroggo, 2014-05-14 20:20:03]

https://codereview.chromium.org/282053002/diff/1/Android.mk
File Android.mk (right):

https://codereview.chromium.org/282053002/diff/1/Android.mk#newcode4
Android.mk:4: # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
As usual, the generated files are just here for reference. I'm not planning to
check in any files named Android.mk

[hal.canary, 2014-05-15 14:29:36]

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h
File bench/ResultsWriter.h (right):

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h#newcode13
bench/ResultsWriter.h:13: #include "SkJSONCPP.h"
For example:

#ifdef SK_BUILD_JSON_WRITER
    #include "SkJSONCPP.h"
#endif  // SK_BUILD_JSON_WRITER

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h#newcode82
bench/ResultsWriter.h:82: #ifndef SK_BUILD_FOR_ANDROID
#ifdef SK_BUILD_JSON_WRITER

https://codereview.chromium.org/282053002/diff/1/include/utils/SkJSONCPP.h
File include/utils/SkJSONCPP.h (right):

https://codereview.chromium.org/282053002/diff/1/include/utils/SkJSONCPP.h#ne...
include/utils/SkJSONCPP.h:16: 
Can we just not include this file?

#ifdef SK_BUILD_JSON_WRITER
    #include "SkJSONCPP.h"
#endif  // SK_BUILD_JSON_WRITER

[scroggo, 2014-05-15 20:00:53]

PTAL. I also made SK_BUILD_JSON_WRITER get set by gyp.

https://codereview.chromium.org/282053002/diff/1/bench/Android.mk
File bench/Android.mk (right):

https://codereview.chromium.org/282053002/diff/1/bench/Android.mk#newcode293
bench/Android.mk:293: $(LOCAL_PATH)/. \
Patch set 2 removes this unnecessary line.

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h
File bench/ResultsWriter.h (right):

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h#newcode13
bench/ResultsWriter.h:13: #include "SkJSONCPP.h"
On 2014/05/15 14:29:36, Hal Canary wrote:
> For example:
> 
> #ifdef SK_BUILD_JSON_WRITER
>     #include "SkJSONCPP.h"
> #endif  // SK_BUILD_JSON_WRITER

Good thought. In the spirit of simplifying things further, I'd prefer to put the
check inside SkJSONCPP.h

https://codereview.chromium.org/282053002/diff/1/bench/ResultsWriter.h#newcode82
bench/ResultsWriter.h:82: #ifndef SK_BUILD_FOR_ANDROID
On 2014/05/15 14:29:36, Hal Canary wrote:
> #ifdef SK_BUILD_JSON_WRITER

Done.

https://codereview.chromium.org/282053002/diff/1/include/utils/SkJSONCPP.h
File include/utils/SkJSONCPP.h (right):

https://codereview.chromium.org/282053002/diff/1/include/utils/SkJSONCPP.h#ne...
include/utils/SkJSONCPP.h:16: 
On 2014/05/15 14:29:36, Hal Canary wrote:
> Can we just not include this file?
> 
> #ifdef SK_BUILD_JSON_WRITER
>     #include "SkJSONCPP.h"
> #endif  // SK_BUILD_JSON_WRITER

As stated elsewhere, I think it's simpler to include this file but make it do
nothing if SK_BUILD_JSON_WRITER is not defined.

[hal.canary, 2014-05-15 20:24:23]

lgtm

[scroggo, 2014-05-15 20:29:55]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-05-15 20:30:11]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/scroggo@google.com/282053002/40001

[commit-bot: I haz the power, 2014-05-15 20:30:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-15 20:30:20]

Presubmit check for 282053002-40001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com')

[scroggo, 2014-05-15 20:31:36]

Mike, can you API approve my change to SkJSONCPP.h?

[reed1, 2014-05-16 13:09:16]

lgtm

[scroggo, 2014-05-16 13:10:11]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-05-16 13:10:25]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/scroggo@google.com/282053002/40001

[commit-bot: I haz the power, 2014-05-16 13:15:47]

Change committed as 14760