Merge "discovery: a new discovery api (mojo)"
diff --git a/mojo.mk b/mojo.mk
index 14ef3db..e6b7b27 100644
--- a/mojo.mk
+++ b/mojo.mk
@@ -79,7 +79,10 @@
 	$(MOJO_SDK)/src/mojo/public/tools/bindings/mojom_bindings_generator.py $1 -I $2 -d $2 -o $3 -g $4 $5
 endef
 
+# On Linux we need to use a different $HOME directory for each mojo run
+# to avoid collision of the cache storage.
 define MOJO_RUN
+	set -e; HOME=$$(mktemp -d); trap "rm -rf $$HOME" EXIT; \
 	$(MOJO_DEVTOOLS)/mojo_run --config-file $(CURDIR)/mojoconfig --shell-path $(MOJO_SHELL) $(MOJO_SHELL_FLAGS) $(MOJO_ANDROID_FLAGS) $1
 endef