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

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

Issue 497503003: Update FDO options to match what is needed by the framework (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: making code uglier to satisfy python linter 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 16 matching lines...) Expand all
27 # that defines COMMON_GLOBAL_CFLAGS 27 # that defines COMMON_GLOBAL_CFLAGS
28 # (b) You can update all the users of libskia to define SK_DEBUG when they are 28 # (b) You can update all the users of libskia to define SK_DEBUG when they are
29 # building their sources. 29 # building their sources.
30 # 30 #
31 # NOTE: If neither SK_DEBUG or SK_RELEASE are defined then Skia checks NDEBUG to 31 # NOTE: If neither SK_DEBUG or SK_RELEASE are defined then Skia checks NDEBUG to
32 # determine which build type to use. 32 # determine which build type to use.
33 ############################################################################### 33 ###############################################################################
34 34
35 include $(CLEAR_VARS) 35 include $(CLEAR_VARS)
36 LOCAL_FDO_SUPPORT := true 36 LOCAL_FDO_SUPPORT := true
37 ifneq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)),)
38 # This should be the last -Oxxx specified in LOCAL_CFLAGS
39 LOCAL_CFLAGS += -O2
40 endif
41
37 LOCAL_ARM_MODE := thumb 42 LOCAL_ARM_MODE := thumb
38 ifeq ($(TARGET_ARCH),arm) 43 ifeq ($(TARGET_ARCH),arm)
39 ifeq ($(ARCH_ARM_HAVE_VFP),true) 44 ifeq ($(ARCH_ARM_HAVE_VFP),true)
40 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE 45 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
41 endif 46 endif
42 else 47 else
43 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE 48 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
44 endif 49 endif
45 50
46 # used for testing 51 # used for testing
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 # 156 #
152 157
153 # benchmark (timings) 158 # benchmark (timings)
154 include $(BASE_PATH)/tools/Android.mk 159 include $(BASE_PATH)/tools/Android.mk
155 160
156 # golden-master (fidelity / regression test) 161 # golden-master (fidelity / regression test)
157 include $(BASE_PATH)/gm/Android.mk 162 include $(BASE_PATH)/gm/Android.mk
158 163
159 # diamond-master (one test to rule them all) 164 # diamond-master (one test to rule them all)
160 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