Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Issue 282053002: Generate bench/Android.mk from gyp. (Closed)

Created:
6 years, 7 months ago by scroggo
Modified:
6 years, 7 months ago
Reviewers:
hal.canary, reed1
CC:
skia-review_googlegroups.com, djsollen
Base URL:
https://skia.googlesource.com/skia.git@baselines
Visibility:
Public.

Description

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

Patch Set 1 #

Total comments: 8

Patch Set 2 : Respond to comments. #

Patch Set 3 : Remove modifications to generated files to submit. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+99 lines, -49 lines) Patch
M bench/DeferredSurfaceCopyBench.cpp View 1 chunk +3 lines, -3 lines 0 comments Download
M bench/ResultsWriter.h View 1 2 chunks +2 lines, -0 lines 0 comments Download
M bench/benchmain.cpp View 1 2 chunks +6 lines, -1 line 0 comments Download
M gyp/bench.gyp View 1 1 chunk +8 lines, -0 lines 0 comments Download
M gyp/common_conditions.gypi View 1 1 chunk +6 lines, -0 lines 0 comments Download
M gyp/common_variables.gypi View 1 2 chunks +5 lines, -0 lines 0 comments Download
M gyp/jsoncpp.gyp View 1 1 chunk +36 lines, -32 lines 0 comments Download
M include/utils/SkJSONCPP.h View 1 2 chunks +5 lines, -1 line 0 comments Download
M platform_tools/android/bin/gyp_to_android.py View 1 chunk +8 lines, -8 lines 0 comments Download
M platform_tools/android/gyp_gen/gypd_parser.py View 1 1 chunk +3 lines, -0 lines 0 comments Download
M platform_tools/android/gyp_gen/makefile_writer.py View 1 chunk +1 line, -1 line 0 comments Download
M platform_tools/android/gyp_gen/tool_makefile_writer.py View 3 chunks +16 lines, -3 lines 0 comments Download

Messages

Total messages: 13 (0 generated)
scroggo
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 ...
6 years, 7 months ago (2014-05-14 20:20:03 UTC) #1
hal.canary
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 ...
6 years, 7 months ago (2014-05-15 14:29:36 UTC) #2
scroggo
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: ...
6 years, 7 months ago (2014-05-15 20:00:53 UTC) #3
hal.canary
lgtm
6 years, 7 months ago (2014-05-15 20:24:23 UTC) #4
scroggo
The CQ bit was checked by scroggo@google.com
6 years, 7 months ago (2014-05-15 20:29:55 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/282053002/40001
6 years, 7 months ago (2014-05-15 20:30:11 UTC) #6
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-15 20:30:20 UTC) #7
commit-bot: I haz the power
Presubmit check for 282053002-40001 failed and returned exit status 1. Running presubmit commit checks ...
6 years, 7 months ago (2014-05-15 20:30:20 UTC) #8
scroggo
Mike, can you API approve my change to SkJSONCPP.h?
6 years, 7 months ago (2014-05-15 20:31:36 UTC) #9
reed1
lgtm
6 years, 7 months ago (2014-05-16 13:09:16 UTC) #10
scroggo
The CQ bit was checked by scroggo@google.com
6 years, 7 months ago (2014-05-16 13:10:11 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/282053002/40001
6 years, 7 months ago (2014-05-16 13:10:25 UTC) #12
commit-bot: I haz the power
6 years, 7 months ago (2014-05-16 13:15:47 UTC) #13
Message was sent while issue was closed.
Change committed as 14760

Powered by Google App Engine
This is Rietveld 408576698