aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-08-18 08:44:54 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-18 08:44:54 -0700
commit0459cc732b8257b98bce39af8b73f82bed2a8d6c (patch)
tree7dd3eec5866f9f055ec13cca192eecd647961ec2 /platform_tools/android/bin
parentea4673fde65f15d6f1ca77e24ced7348c4914517 (diff)
Android.mk: bench_pictures -> nanobench
We're only keeping bench_pictures around for the bots now. For human-initiated work, nanobench is the way to go. BUG=skia: R=djsollen@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/484663002
Diffstat (limited to 'platform_tools/android/bin')
-rwxr-xr-xplatform_tools/android/bin/gyp_to_android.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index d1dd7bd81c..a42471b2e0 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -132,13 +132,13 @@ def main(target_dir=None, require_sk_user_config=False):
defines=common.DEFINES)
tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
- target_file='tools.gyp',
+ target_file='bench.gyp',
skia_trunk=target_dir,
- dest_dir='tools',
+ dest_dir='bench',
skia_lib_var_dict=common,
- local_module_name='skia_bench_pictures',
+ local_module_name='skia_nanobench',
local_module_tags=['tests'],
- desired_targets=['bench_pictures'])
+ desired_targets=['nanobench'])
tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
target_file='gm.gyp',