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

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

Issue 494193003: Fix root level Android.mk to now point to the correct nanobench makefile (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « platform_tools/android/gyp_gen/makefile_writer.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 local_module_bar 149 local_module_bar
150 150
151 include external/stlport/libstlport.mk 151 include external/stlport/libstlport.mk
152 include $(BUILD_SHARED_LIBRARY) 152 include $(BUILD_SHARED_LIBRARY)
153 153
154 ############################################################# 154 #############################################################
155 # Build the skia tools 155 # Build the skia tools
156 # 156 #
157 157
158 # benchmark (timings) 158 # benchmark (timings)
159 include $(BASE_PATH)/tools/Android.mk 159 include $(BASE_PATH)/bench/Android.mk
160 160
161 # golden-master (fidelity / regression test) 161 # golden-master (fidelity / regression test)
162 include $(BASE_PATH)/gm/Android.mk 162 include $(BASE_PATH)/gm/Android.mk
163 163
164 # diamond-master (one test to rule them all) 164 # diamond-master (one test to rule them all)
165 include $(BASE_PATH)/dm/Android.mk 165 include $(BASE_PATH)/dm/Android.mk
OLDNEW
« no previous file with comments | « platform_tools/android/gyp_gen/makefile_writer.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698