| 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 # For bugs, please contact scroggo@google.com or djsollen@google.com | 6 # For bugs, please contact scroggo@google.com or djsollen@google.com |
| 7 # | 7 # |
| 8 ############################################################################### | 8 ############################################################################### |
| 9 | 9 |
| 10 BASE_PATH := $(call my-dir) | 10 BASE_PATH := $(call my-dir) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 ############################################################################### | 35 ############################################################################### |
| 36 | 36 |
| 37 include $(CLEAR_VARS) | 37 include $(CLEAR_VARS) |
| 38 LOCAL_FDO_SUPPORT := true | 38 LOCAL_FDO_SUPPORT := true |
| 39 ifneq ($(strip $(TARGET_FDO_CFLAGS)),) | 39 ifneq ($(strip $(TARGET_FDO_CFLAGS)),) |
| 40 # This should be the last -Oxxx specified in LOCAL_CFLAGS | 40 # This should be the last -Oxxx specified in LOCAL_CFLAGS |
| 41 LOCAL_CFLAGS += -O2 | 41 LOCAL_CFLAGS += -O2 |
| 42 endif | 42 endif |
| 43 | 43 |
| 44 LOCAL_ARM_MODE := thumb | 44 LOCAL_ARM_MODE := thumb |
| 45 ifeq ($(TARGET_ARCH),arm) | |
| 46 ifeq ($(ARCH_ARM_HAVE_VFP),true) | |
| 47 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE | |
| 48 endif | |
| 49 else | |
| 50 LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE | |
| 51 endif | |
| 52 | |
| 53 # used for testing | 45 # used for testing |
| 54 #LOCAL_CFLAGS += -g -O0 | 46 #LOCAL_CFLAGS += -g -O0 |
| 55 | 47 |
| 56 ifeq ($(NO_FALLBACK_FONT),true) | 48 ifeq ($(NO_FALLBACK_FONT),true) |
| 57 LOCAL_CFLAGS += -DNO_FALLBACK_FONT | 49 LOCAL_CFLAGS += -DNO_FALLBACK_FONT |
| 58 endif | 50 endif |
| 59 | 51 |
| 60 LOCAL_CFLAGS += \ | 52 LOCAL_CFLAGS += \ |
| 61 local_cflags | 53 local_cflags |
| 62 | 54 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 146 |
| 155 ############################################################# | 147 ############################################################# |
| 156 # Build the skia tools | 148 # Build the skia tools |
| 157 # | 149 # |
| 158 | 150 |
| 159 # benchmark (timings) | 151 # benchmark (timings) |
| 160 include $(BASE_PATH)/bench/Android.mk | 152 include $(BASE_PATH)/bench/Android.mk |
| 161 | 153 |
| 162 # diamond-master (one test to rule them all) | 154 # diamond-master (one test to rule them all) |
| 163 include $(BASE_PATH)/dm/Android.mk | 155 include $(BASE_PATH)/dm/Android.mk |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1103313002:
Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders (Closed)
Base URL: https://skia.googlesource.com/skia.git@master