diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 17:56:43 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 17:56:43 +0000 |
| commit | 25c1066e4d23cf7cb1795c78987f4fde08282b46 (patch) | |
| tree | 45da3191440170d80460ad42ef2572cdaddf0725 /platform_tools/android | |
| parent | a783559c26f8d8554be1fc50877da02e86301c2e (diff) | |
Generate gm/Android.mk, minus JSON.
When running gyp_to_android.py, generate the makefile for gm.
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
gm/gm_expectations.cpp:
gm/gm_expectations.h:
gm/gmmain.cpp:
Remove all json functionality when SK_BUILD_JSON_WRITER is not defined.
This flag is not defined when SK_BUILD_FOR_ANDROID is defined.
gyp/gm.gyp:
Depend on skia and cutils.
platform_tools/android/bin/gyp_to_android.py:
Generate gm/Android.mk.
platform_tools/android/gyp_gen/makefile_writer.py:
Build gm/Android.mk when building external/skia.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
BUG=skia:2448
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/281303003
git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 8 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index 8994efdf05..f6fc5785a2 100755 --- a/platform_tools/android/bin/gyp_to_android.py +++ b/platform_tools/android/bin/gyp_to_android.py @@ -144,6 +144,14 @@ def main(target_dir=None, require_sk_user_config=False): local_module_tags=['tests'], place_in_local_tmp=True) + 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=['optional']) + # Now that the defines have been written to SkUserConfig and they've been # used to skip adding them to the tools makefiles, they are not needed in # Android.mk. Reset DEFINES. diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 1c927601df..948407e974 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -120,7 +120,7 @@ SKIA_TOOLS = ( include $(BASE_PATH)/bench/Android.mk # golden-master (fidelity / regression test) -#include $(BASE_PATH)/gm/Android.mk +include $(BASE_PATH)/gm/Android.mk # unit-tests include $(BASE_PATH)/tests/Android.mk |