commit 1ccaa8fbd8cb68f6115a25f30ad3d34a15ee3da2
author Yohann Roussel <yroussel@google.com> Mon Mar 16 17:08:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 16 17:08:01 2015 +0000
tree 77b9b1e8b2414e1b66c06bc2daf72db1224b17d3
parent f252faae65f6e657626df069a747411f745bb34c
parent f528e132d60fc8c982e41c242017beb6d4f7df76

Merge "Make Jack use tmp dir specified by TMPDIR"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index c01f0a6..3811190 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -134,6 +134,12 @@
 # TODO: do symbol compression
 TARGET_COMPRESS_MODULE_SYMBOLS := false
 
+ifdef TMPDIR
+JAVA_TMPDIR_ARG := -Djava.io.tmpdir=$(TMPDIR)
+else
+JAVA_TMPDIR_ARG :=
+endif
+
 # ###############################################################
 # Include sub-configuration files
 # ###############################################################
@@ -430,7 +436,7 @@
 # $(1): vm arguments
 # $(2): jack perf arguments
 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
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
 ifneq ($(ANDROID_JACK_VM_ARGS),)
@@ -443,6 +449,7 @@
 else
 DEFAULT_JACK_EXTRA_ARGS := --sanity-checks off -D jack.reporter.level.file=error=--,warning=-
 endif
+
 JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main
 PROGUARD := external/proguard/bin/proguard.sh
 JAVATAGS := build/tools/java-event-log-tags.py