diff options
| author |  djsollen <djsollen@google.com> | 2015-02-23 12:37:32 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-23 12:37:32 -0800 |
| commit | f056bd1e01078c02b35d00c22d55ef52b017ef7f (patch) | |
| tree | 27e77143199184348495fa253c414e2ab3c23dd8 /platform_tools | |
| parent | eebc39ad5a1dcbde1b10a9b2ab54679549522b52 (diff) | |
Ensure that skia's test resources are properly packaged on Android
Review URL: https://codereview.chromium.org/949853003
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp_gen/tool_makefile_writer.py | 16 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/tool/Android.mk | 10 |
2 files changed, 21 insertions, 5 deletions
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index 897a2b8607..ac00be8e1c 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -14,6 +14,18 @@ import makefile_writer import os import vars_dict_lib +SKIA_RESOURCES = ( +""" +# Setup directory to store skia's resources in the directory structure that +# the Android testing infrastructure expects +skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA +$(shell mkdir -p $(skia_res_dir)) +$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources) +LOCAL_PICKUP_FILES := $(skia_res_dir) +skia_res_dir := + +""" +) def write_tool_android_mk(target_dir, var_dict): """Write Android.mk for a Skia tool. @@ -31,9 +43,7 @@ def write_tool_android_mk(target_dir, var_dict): makefile_writer.write_local_vars(f, var_dict, False, None) - makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES', - ['$(LOCAL_PATH)/../resources'], False) - + f.write(SKIA_RESOURCES) f.write('include $(BUILD_NATIVE_TEST)\n') diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk index 7cb3e83ec0..8c0389d483 100644 --- a/platform_tools/android/tests/expectations/tool/Android.mk +++ b/platform_tools/android/tests/expectations/tool/Android.mk @@ -39,7 +39,13 @@ LOCAL_MODULE_TAGS := \ LOCAL_MODULE := \ local_module -LOCAL_PICKUP_FILES := \ - $(LOCAL_PATH)/../resources + +# Setup directory to store skia's resources in the directory structure that +# the Android testing infrastructure expects +skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA +$(shell mkdir -p $(skia_res_dir)) +$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources) +LOCAL_PICKUP_FILES := $(skia_res_dir) +skia_res_dir := include $(BUILD_NATIVE_TEST) |