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

Side by Side Diff: platform_tools/android/tests/expectations/tool/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
« no previous file with comments | « platform_tools/android/tests/expectations/Android.mk ('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 LOCAL_PATH:= $(call my-dir) 8 LOCAL_PATH:= $(call my-dir)
9 include $(CLEAR_VARS) 9 include $(CLEAR_VARS)
10 LOCAL_CFLAGS += \ 10 LOCAL_CFLAGS += \
(...skipping 22 matching lines...) Expand all
33 33
34 LOCAL_MODULE_TAGS := \ 34 LOCAL_MODULE_TAGS := \
35 local_module_tags 35 local_module_tags
36 36
37 LOCAL_MODULE := \ 37 LOCAL_MODULE := \
38 local_module 38 local_module
39 39
40 LOCAL_PICKUP_FILES := \ 40 LOCAL_PICKUP_FILES := \
41 $(LOCAL_PATH)/../resources 41 $(LOCAL_PATH)/../resources
42 42
43 include external/stlport/libstlport.mk
44 include $(BUILD_NATIVE_TEST) 43 include $(BUILD_NATIVE_TEST)
OLDNEW
« no previous file with comments | « platform_tools/android/tests/expectations/Android.mk ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698