commit c7bfd5b441c0061e4eb787a9ac97448aee58ada5
author scroggo <scroggo@google.com> Tue Jan 20 08:25:36 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 20 08:25:36 2015 -0800
tree 95efda98936b2ba3a6d018726bca10354d9b2cc7
parent 83c8dec46a7a191b8e5a0b31a866e0b743f4dd72

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

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index 89b8d52..aacbe98 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -149,16 +149,6 @@
                                        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',

platform_tools/android/gyp_gen/makefile_writer.py

diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 0105e1d..9b63b65 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -119,9 +119,6 @@
 # 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
 """