platform_tools/android/tests/expectations/Android.mk - Issue 718793003: Revert of Move from libstlport to libc++ for Android framework builds

Side by Side Diff

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

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

Side by Side Diff: platform_tools/android/tests/expectations/Android.mk

Issue 718793003: Revert of Move from libstlport to libc++ for Android framework builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 1 month 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 unified diff | Download patch

OLD	NEW
1	1

2 ###############################################################################	2 ###############################################################################

3 #	3 #

4 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.	4 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.

5 #	5 #

6 ###############################################################################	6 ###############################################################################

7	7

8 BASE_PATH := $(call my-dir)	8 BASE_PATH := $(call my-dir)

9 LOCAL_PATH:= $(call my-dir)	9 LOCAL_PATH:= $(call my-dir)

10	10

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141	141

142 LOCAL_CFLAGS_bar += \	142 LOCAL_CFLAGS_bar += \

143 -Ddefines_bar	143 -Ddefines_bar

144	144

145 LOCAL_MODULE_TAGS_bar += \	145 LOCAL_MODULE_TAGS_bar += \

146 local_module_tags_bar	146 local_module_tags_bar

147	147

148 LOCAL_MODULE_bar += \	148 LOCAL_MODULE_bar += \

149 local_module_bar	149 local_module_bar

150	150

	151 include external/stlport/libstlport.mk

151 include $(BUILD_SHARED_LIBRARY)	152 include $(BUILD_SHARED_LIBRARY)

152	153

153 #############################################################	154 #############################################################

154 # Build the skia tools	155 # Build the skia tools

155 #	156 #

156	157

157 # benchmark (timings)	158 # benchmark (timings)

158 include $(BASE_PATH)/bench/Android.mk	159 include $(BASE_PATH)/bench/Android.mk

159	160

160 # golden-master (fidelity / regression test)	161 # golden-master (fidelity / regression test)

161 include $(BASE_PATH)/gm/Android.mk	162 include $(BASE_PATH)/gm/Android.mk

162	163

163 # diamond-master (one test to rule them all)	164 # diamond-master (one test to rule them all)

164 include $(BASE_PATH)/dm/Android.mk	165 include $(BASE_PATH)/dm/Android.mk

OLD	NEW