Chromium Code Reviews Chromium Code Reviews
Issue 481943002:
Fix Android platform self-tests (Closed)
Base URL: https://skia.googlesource.com/skia.git@master| 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 15 matching lines...) Expand all Loading... | |
| 26 # updating your build/core/config.mk to include -DSK_DEBUG on the line | 26 # updating your build/core/config.mk to include -DSK_DEBUG on the line |
| 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 | |
|
borenet
2014/08/18 14:06:28
No idea what this means; it was added when I ran -
scroggo
2014/10/14 21:27:13
FYI:
Generated by the change in https://coderevie
| |
| 36 LOCAL_ARM_MODE := thumb | 37 LOCAL_ARM_MODE := thumb |
| 37 ifeq ($(TARGET_ARCH),arm) | 38 ifeq ($(TARGET_ARCH),arm) |
| 38 ifeq ($(ARCH_ARM_HAVE_VFP),true) | 39 ifeq ($(ARCH_ARM_HAVE_VFP),true) |
| 39 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE | 40 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE |
| 40 endif | 41 endif |
| 41 else | 42 else |
| 42 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE | 43 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE |
| 43 endif | 44 endif |
| 44 | 45 |
| 45 # used for testing | 46 # used for testing |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 local_module_bar | 144 local_module_bar |
| 144 | 145 |
| 145 include external/stlport/libstlport.mk | 146 include external/stlport/libstlport.mk |
| 146 include $(BUILD_SHARED_LIBRARY) | 147 include $(BUILD_SHARED_LIBRARY) |
| 147 | 148 |
| 148 ############################################################# | 149 ############################################################# |
| 149 # Build the skia tools | 150 # Build the skia tools |
| 150 # | 151 # |
| 151 | 152 |
| 152 # benchmark (timings) | 153 # benchmark (timings) |
| 153 include $(BASE_PATH)/bench/Android.mk | |
|
borenet
2014/08/18 14:06:28
I don't know why this was removed when I ran --reb
djsollen
2014/08/18 14:08:22
because the bench binary no longer exists (i.e. lo
| |
| 154 include $(BASE_PATH)/tools/Android.mk | 154 include $(BASE_PATH)/tools/Android.mk |
| 155 | 155 |
| 156 # golden-master (fidelity / regression test) | 156 # golden-master (fidelity / regression test) |
| 157 include $(BASE_PATH)/gm/Android.mk | 157 include $(BASE_PATH)/gm/Android.mk |
| 158 | 158 |
| 159 # unit-tests | |
| 160 include $(BASE_PATH)/tests/Android.mk | |
| 161 | |
| 162 # diamond-master (one test to rule them all) | 159 # diamond-master (one test to rule them all) |
| 163 include $(BASE_PATH)/dm/Android.mk | 160 include $(BASE_PATH)/dm/Android.mk |
| OLD | NEW |
