platform_tools/android/tests/expectations/tool/Android.mk - Issue 949853003: Ensure that skia's test resources are properly packaged on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/tests/expectations/tool/Android.mk

Issue 949853003: Ensure that skia's test resources are properly packaged on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: platform_tools/android/tests/expectations/tool/Android.mk

diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk

index 7cb3e83ec02212c25316b9559a5343bf786f6d15..8c0389d483fe2d29e1ebae6d99735b216416ae63 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)

« no previous file with comments | « platform_tools/android/gyp_gen/tool_makefile_writer.py ('k') | no next file » | no next file with comments »