aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-06-11 10:13:03 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-11 10:13:03 -0700
commit78d79cc5759d5ec6fb48b28b0cc22d396eb69fb5 (patch)
treef2c565bc02af0343ac0adb3548f29cf0153f9dc8 /platform_tools
parent8d0d2b8577bcfe329197286afbd3a01fd5d799c0 (diff)
Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders
Diffstat (limited to 'platform_tools')
-rw-r--r--platform_tools/android/gyp_gen/makefile_writer.py12
-rw-r--r--platform_tools/android/tests/expectations/Android.mk8
2 files changed, 0 insertions, 20 deletions
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index a199a831f4..93af4d2b1f 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -196,18 +196,6 @@ def write_android_mk(target_dir, common, deviations_from_common):
f.write('LOCAL_ARM_MODE := thumb\n')
- # need a flag to tell the C side when we're on devices with large memory
- # budgets (i.e. larger than the low-end devices that initially shipped)
- # On arm, only define the flag if it has VFP. For all other architectures,
- # always define the flag.
- f.write('ifeq ($(TARGET_ARCH),arm)\n')
- f.write('\tifeq ($(ARCH_ARM_HAVE_VFP),true)\n')
- f.write('\t\tLOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE\n')
- f.write('\tendif\n')
- f.write('else\n')
- f.write('\tLOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE\n')
- f.write('endif\n\n')
-
f.write('# used for testing\n')
f.write('#LOCAL_CFLAGS += -g -O0\n\n')
diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk
index 371979e8b4..c7ac190422 100644
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -42,14 +42,6 @@ ifneq ($(strip $(TARGET_FDO_CFLAGS)),)
endif
LOCAL_ARM_MODE := thumb
-ifeq ($(TARGET_ARCH),arm)
- ifeq ($(ARCH_ARM_HAVE_VFP),true)
- LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
- endif
-else
- LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
-endif
-
# used for testing
#LOCAL_CFLAGS += -g -O0