tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make Jack use tmp dir specified by TMPDIR

Browse source 
If the environment variable is defined.

Bug: 19654122
Change-Id: Ib238a2c2eb60296a96de98a4a54e0996d4c8a958
This commit is contained in:
Yohann Roussel 2015-03-13 12:08:26 +01:00
parent 83a1934085
commit f528e132d6
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/config.mk
View file

@ -134,6 +134,12 @@ TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=addre
# TODO: do symbol compression # TODO: do symbol compression
TARGET_COMPRESS_MODULE_SYMBOLS := false TARGET_COMPRESS_MODULE_SYMBOLS := false
ifdef TMPDIR
JAVA_TMPDIR_ARG := -Djava.io.tmpdir=$(TMPDIR)
else
JAVA_TMPDIR_ARG :=
endif
# ############################################################### # ###############################################################
# Include sub-configuration files # Include sub-configuration files
# ############################################################### # ###############################################################
@ -430,7 +436,7 @@ endif
# $(1): vm arguments # $(1): vm arguments
# $(2): jack perf arguments # $(2): jack perf arguments
define call-jack define call-jack
$(JACK_VM) $(1) -cp $(JACK_JAR) com.android.jack.Main $(2) $(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -cp $(JACK_JAR) com.android.jack.Main $(2)
endef endef
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
ifneq ($(ANDROID_JACK_VM_ARGS),) ifneq ($(ANDROID_JACK_VM_ARGS),)
@ -443,6 +449,7 @@ DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
else else
DEFAULT_JACK_EXTRA_ARGS := --sanity-checks off DEFAULT_JACK_EXTRA_ARGS := --sanity-checks off
endif endif
JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main
PROGUARD := external/proguard/bin/proguard.sh PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py JAVATAGS := build/tools/java-event-log-tags.py