AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that skia's test resources are properly packaged on Android

Browse Source 
Review URL: https://codereview.chromium.org/949853003
This commit is contained in:
djsollen 2015-02-23 12:37:32 -08:00 committed by Commit bot
parent eebc39ad5a
commit f056bd1e01
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform_tools/android/gyp_gen/tool_makefile_writer.py
View File

@ -14,6 +14,18 @@ import makefile_writer
import os import os
import vars_dict_lib 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): def write_tool_android_mk(target_dir, var_dict):
"""Write Android.mk for a Skia tool. """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_local_vars(f, var_dict, False, None)
makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES', f.write(SKIA_RESOURCES)
['$(LOCAL_PATH)/../resources'], False)
f.write('include $(BUILD_NATIVE_TEST)\n') f.write('include $(BUILD_NATIVE_TEST)\n')

10
platform_tools/android/tests/expectations/tool/Android.mk
View File

@ -39,7 +39,13 @@ LOCAL_MODULE_TAGS := \
LOCAL_MODULE := \ LOCAL_MODULE := \
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) include $(BUILD_NATIVE_TEST)