platform_tools/android/tests/expectations/tool/Android.mk - Issue 1696483002: Update Android framework makefile to build static and shared libs

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 1696483002: Update Android framework makefile to build static and shared libs (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: new test Created 4 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

« no previous file with comments | « platform_tools/android/tests/expectations/skia_static_deps.mk ('k') | platform_tools/android/tests/makefile_writer_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b5ecbe4195345f0fc2c87ae780ff0237bd22ddf9..bd13b71d3b2bf23b5ab7891e74c644dbff61b4dc 100644

--- a/platform_tools/android/tests/expectations/tool/Android.mk

+++ b/platform_tools/android/tests/expectations/tool/Android.mk

@@ -45,4 +45,5 @@ LOCAL_MODULE := \

# 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 $(LOCAL_PATH)/../skia_static_deps.mk

include $(BUILD_NATIVE_TEST)