auto import from //branches/cupcake/...@125939
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 4d337d1..d4c04e7 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -12,7 +12,7 @@
COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \
-target 1.5 -Xmaxerrs 9999999
else
- COMMON_JAVAC := javac -J-Xmx256m -target 1.5 -Xmaxerrs 9999999
+ COMMON_JAVAC := javac -J-Xmx512M -target 1.5 -Xmaxerrs 9999999
endif
# Eclipse.
diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk
index adb82d3..507e4dd 100644
--- a/core/combo/linux-arm.mk
+++ b/core/combo/linux-arm.mk
@@ -53,6 +53,7 @@
-ffunction-sections \
-funwind-tables \
-fstack-protector \
+ -fno-short-enums \
-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
-D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
-include $(call select-android-config-h,linux-arm)