diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
| commit | 4f85cc54b3347e00e32a07cae4fd5473987b71af (patch) | |
| tree | f1b5a1212c9ba3b4cf9d69855d653991886d9181 /core/combo | |
| parent | dcc08f073b6873c69ab891d4f69f7c568e282df7 (diff) | |
| download | build-4f85cc54b3347e00e32a07cae4fd5473987b71af.zip build-4f85cc54b3347e00e32a07cae4fd5473987b71af.tar.gz build-4f85cc54b3347e00e32a07cae4fd5473987b71af.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/javac.mk | 2 | ||||
| -rw-r--r-- | core/combo/linux-arm.mk | 1 |
2 files changed, 2 insertions, 1 deletions
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 @@ ifeq ($(HOST_OS), windows) 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 @@ $(combo_target)GLOBAL_CFLAGS += \ -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) |