Fix build rules.
The (dir $@) is a shared directory that could collide with another
rule. So instead prefix temporary files with $@_.
Also remove verbose flag to the zipalign command.
Test: m
Change-Id: Ie93e2b486095ee7d8a007dc15dd393f26bab03e8
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 52fcb49..ff9738d 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -124,34 +124,34 @@
ifdef ART_TEST_HOST_GTEST_Main_DEX
$(ART_TEST_HOST_GTEST_EmptyUncompressed_DEX):
- touch $(dir $@)classes.dex
- zip -j -qD -X -0 $@ $(dir $@)classes.dex
- rm $(dir $@)classes.dex
+ touch $@_classes.dex
+ zip -j -qD -X -0 $@ $@_classes.dex
+ rm $@_classes.dex
endif
ifdef ART_TEST_TARGET_GTEST_Main_DEX
$(ART_TEST_TARGET_GTEST_EmptyUncompressed_DEX):
- touch $(dir $@)classes.dex
- zip -j -qD -X -0 $@ $(dir $@)classes.dex
- rm $(dir $@)classes.dex
+ touch $@_classes.dex
+ zip -j -qD -X -0 $@ $@_classes.dex
+ rm $@_classes.dex
endif
ifdef ART_TEST_HOST_GTEST_Main_DEX
$(ART_TEST_HOST_GTEST_EmptyUncompressedAligned_DEX): $(ZIPALIGN)
- touch $(dir $@)classes.dex
- zip -j -0 $(dir $@)temp.zip $(dir $@)classes.dex
- $(ZIPALIGN) -f -v 4 $(dir $@)temp.zip $@
- rm $(dir $@)classes.dex
- rm $(dir $@)temp.zip
+ touch $@_classes.dex
+ zip -j -0 $@_temp.zip $@_classes.dex
+ $(ZIPALIGN) -f 4 $@_temp.zip $@
+ rm $@_classes.dex
+ rm $@_temp.zip
endif
ifdef ART_TEST_TARGET_GTEST_Main_DEX
$(ART_TEST_TARGET_GTEST_EmptyUncompressedAligned_DEX): $(ZIPALIGN)
- touch $(dir $@)classes.dex
- zip -j -0 $(dir $@)temp.zip $(dir $@)classes.dex
- $(ZIPALIGN) -f -v 4 $(dir $@)temp.zip $@
- rm $(dir $@)classes.dex
- rm $(dir $@)temp.zip
+ touch $@_classes.dex
+ zip -j -0 $@_temp.zip $@_classes.dex
+ $(ZIPALIGN) -f 4 $@_temp.zip $@
+ rm $@_classes.dex
+ rm $@_temp.zip
endif
ifdef ART_TEST_HOST_GTEST_MultiDex_DEX
