platform_tools/android/tests/expectations/Android.mk - Issue 235883015: Generate tests/Android.mk from gyp

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/Android.mk

Issue 235883015: Generate tests/Android.mk from gyp (Closed) Base URL: https://skia.googlesource.com/skia.git@generate

Patch Set: Remove Android.mk/SkUserConfig.h Created 6 years, 8 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/android_framework_gyp_tests.py ('k') | platform_tools/android/tests/expectations/tool/Android.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9fab0ac2d9097be582585e96f78293c0ae14a9cf..bba6824d8617d553b2dbe4ad24bd00d147489f77 100644

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

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

@@ -73,6 +73,12 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \

LOCAL_CFLAGS += \

-Ddefines

+LOCAL_MODULE_TAGS := \

+ local_module_tags

+LOCAL_MODULE := \

+ local_module

ifeq ($(COND), true)

LOCAL_CFLAGS_foo += \

local_cflags_foo

@@ -98,6 +104,12 @@ LOCAL_EXPORT_C_INCLUDE_DIRS_foo += \

LOCAL_CFLAGS_foo += \

-Ddefines_foo

+LOCAL_MODULE_TAGS_foo += \

+ local_module_tags_foo

+LOCAL_MODULE_foo += \

+ local_module_foo

endif

LOCAL_CFLAGS_bar += \

@@ -124,8 +136,13 @@ LOCAL_EXPORT_C_INCLUDE_DIRS_bar += \

LOCAL_CFLAGS_bar += \

-Ddefines_bar

+LOCAL_MODULE_TAGS_bar += \

+ local_module_tags_bar

+LOCAL_MODULE_bar += \

+ local_module_bar

include external/stlport/libstlport.mk

-LOCAL_MODULE:= libskia

include $(BUILD_SHARED_LIBRARY)

#############################################################

@@ -139,7 +156,4 @@ include $(BUILD_SHARED_LIBRARY)

#include $(BASE_PATH)/gm/Android.mk

# unit-tests

-#include $(BASE_PATH)/tests/Android.mk

-# pathOps unit-tests

-# TODO include those sources!

+include $(BASE_PATH)/tests/Android.mk