Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f85cc54 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@125939

parent dcc08f07

core/combo/javac.mk

+1 −1
Original line number Diff line number Diff line
@@ -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.

core/combo/linux-arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
# current configuration and platform, which

# are not specific to what is being built.



# Use bash, not whatever shell somebody has installed as /bin/sh

# This is repeated from main.mk, since envsetup.sh runs this file

# directly.

SHELL := /bin/bash



# Standard source directories.

SRC_DOCS:= $(TOPDIR)docs

# TODO: Enforce some kind of layering; only add include paths

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -1147,11 +1147,13 @@ $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \ 
@rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)

endef



#TODO: use a smaller -Xmx value for most libraries;

#      only core.jar and framework.jar need a heap this big.

define transform-classes.jar-to-dex

@echo "target Dex: $(PRIVATE_MODULE)"

@mkdir -p $(dir $@)

$(hide) $(DX) -JXms16M \

    $(if $(GENERATE_DEX_DEBUG), -JXmx1536M, -JXmx1280M) \

    -JXmx1536M \

    --dex --output=$@ \

    $(if $(NO_OPTIMIZE_DX), \

        --no-optimize) \

core/main.mk

+2 −0
Original line number Diff line number Diff line 


# Use bash, not whatever shell somebody has installed as /bin/sh

# This is repeated in config.mk, since envsetup.sh runs that file

# directly.

SHELL := /bin/bash



# this turns off the suffix rules built into make