diff options
| author |  scroggo <scroggo@google.com> | 2015-01-20 08:25:36 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-20 08:25:36 -0800 |
| commit | c7bfd5b441c0061e4eb787a9ac97448aee58ada5 (patch) | |
| tree | 95efda98936b2ba3a6d018726bca10354d9b2cc7 /platform_tools | |
| parent | 83c8dec46a7a191b8e5a0b31a866e0b743f4dd72 (diff) | |
Stop building gm in Android framework build.
Allows us to delete gm.
Review URL: https://codereview.chromium.org/860803004
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 10 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 3 |
2 files changed, 0 insertions, 13 deletions
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 @@ -149,16 +149,6 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): 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, dest_dir='dm', 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 """ |