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

Unified Diff: platform_tools/android/gyp_gen/makefile_writer.py

Issue 1103313002: Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Never overwrite default memory Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | platform_tools/android/tests/expectations/Android.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/gyp_gen/makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index a199a831f49ccf31e84cd06cc4172c82556036a8..93af4d2b1f7a15663f1994eb319f10e47f90e67e 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')
« no previous file with comments | « no previous file | platform_tools/android/tests/expectations/Android.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698