From c7bfd5b441c0061e4eb787a9ac97448aee58ada5 Mon Sep 17 00:00:00 2001 From: scroggo Date: Tue, 20 Jan 2015 08:25:36 -0800 Subject: Stop building gm in Android framework build. Allows us to delete gm. Review URL: https://codereview.chromium.org/860803004 --- platform_tools/android/bin/gyp_to_android.py | 10 ---------- platform_tools/android/gyp_gen/makefile_writer.py | 3 --- 2 files changed, 13 deletions(-) (limited to 'platform_tools') diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index 89b8d52d28..aacbe98a0a 100755 --- a/platform_tools/android/bin/gyp_to_android.py +++ b/platform_tools/android/bin/gyp_to_android.py @@ -148,16 +148,6 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): desired_targets=['nanobench'], gyp_source_dir=gyp_source_dir) - tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, - target_file='gm.gyp', - skia_trunk=target_dir, - dest_dir='gm', - skia_lib_var_dict=common, - local_module_name='skia_gm', - local_module_tags=['tests'], - desired_targets=['gm'], - gyp_source_dir=gyp_source_dir) - tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, target_file='dm.gyp', skia_trunk=target_dir, diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 0105e1dc57..9b63b656b6 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -119,9 +119,6 @@ SKIA_TOOLS = ( # benchmark (timings) include $(BASE_PATH)/bench/Android.mk -# golden-master (fidelity / regression test) -include $(BASE_PATH)/gm/Android.mk - # diamond-master (one test to rule them all) include $(BASE_PATH)/dm/Android.mk """ -- cgit v1.2.3