Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

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

Issue 714113002: 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
OLDNEW
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
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
152 include $(BUILD_SHARED_LIBRARY) 151 include $(BUILD_SHARED_LIBRARY)
153 152
154 ############################################################# 153 #############################################################
155 # Build the skia tools 154 # Build the skia tools
156 # 155 #
157 156
158 # benchmark (timings) 157 # benchmark (timings)
159 include $(BASE_PATH)/bench/Android.mk 158 include $(BASE_PATH)/bench/Android.mk
160 159
161 # golden-master (fidelity / regression test) 160 # golden-master (fidelity / regression test)
162 include $(BASE_PATH)/gm/Android.mk 161 include $(BASE_PATH)/gm/Android.mk
163 162
164 # diamond-master (one test to rule them all) 163 # diamond-master (one test to rule them all)
165 include $(BASE_PATH)/dm/Android.mk 164 include $(BASE_PATH)/dm/Android.mk
OLDNEW
« no previous file with comments | « platform_tools/android/gyp_gen/tool_makefile_writer.py ('k') | platform_tools/android/tests/expectations/tool/Android.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698