commit 5a79fdecffbea657ebecd4cf19078925239eb1c3
author Andreas Gampe <agampe@google.com> Wed Aug 06 13:12:26 2014 -0700
committer Andreas Gampe <agampe@google.com> Wed Aug 06 20:27:47 2014 +0000
tree c35ab30420657b309144f99ee0aa3e8ee879514a
parent 1b192268f167f603fc372f02f9067f3ce5d82daf

ART: Use TMPDIR for test directories

Bug: 16499668
Change-Id: I0d3db4697ef7b1706807e7daa5e000bb89df14e0

Android.mk

diff --git a/Android.mk b/Android.mk
index 451edf1..15e8308 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,8 +67,13 @@
 	rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
 	rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex
 endif
+ifneq ($(TMPDIR),)
+	rm -rf $(TMPDIR)/$(USER)/test-*/dalvik-cache/*
+	rm -rf $(TMPDIR)/android-data/dalvik-cache/*
+else
 	rm -rf /tmp/$(USER)/test-*/dalvik-cache/*
 	rm -rf /tmp/android-data/dalvik-cache/*
+endif
 
 .PHONY: clean-oat-target
 clean-oat-target: