diff options
| author |  djsollen <djsollen@google.com> | 2015-06-05 09:39:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-05 09:39:30 -0700 |
| commit | fe79007a1343574860aad6a36188b10e6a63d805 (patch) | |
| tree | 4d30ff2203d0b0954d8f957c623f0be4fd632076 /platform_tools | |
| parent | cb674144545866ed31a9ab5dd8e7152282017e40 (diff) | |
Update how we package skia resource for android testing
Review URL: https://codereview.chromium.org/1119283004
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp_gen/tool_makefile_writer.py | 13 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/tool/Android.mk | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index ac00be8e1c..2fef11009d 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -16,14 +16,11 @@ 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 := - +# Store skia's resources in the directory structure that the Android testing +# infrastructure expects. This requires that Skia maintain a symlinked +# subdirectory in the DATA folder that points to the top level skia resources... +# i.e. external/skia/DATA/skia_resources --> ../resources +LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA """ ) diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk index 8c0389d483..b5ecbe4195 100644 --- a/platform_tools/android/tests/expectations/tool/Android.mk +++ b/platform_tools/android/tests/expectations/tool/Android.mk @@ -40,12 +40,9 @@ LOCAL_MODULE := \ local_module -# 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 := - +# Store skia's resources in the directory structure that the Android testing +# infrastructure expects. This requires that Skia maintain a symlinked +# subdirectory in the DATA folder that points to the top level skia resources... +# i.e. external/skia/DATA/skia_resources --> ../resources +LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA include $(BUILD_NATIVE_TEST) |