art: convert makefiles to support multilib build
Convert makefiles to allow for building two architectures at the
same time. More changes may be necessary to get the tests to
build.
Change-Id: I02ba11706b7e5b5592d76e43c167bcbf0e665b93
diff --git a/Android.mk b/Android.mk
index 6ad5606..b8d14e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,6 +62,10 @@
rm -f $(TARGET_OUT_APPS)/*.odex
rm -f $(TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
rm -f $(TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex
+ifdef TARGET_2ND_ARCH
+ rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
+ rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex
+endif
rm -rf /tmp/test-*/dalvik-cache/*@classes.dex
rm -rf /tmp/android-data/dalvik-cache/*@classes.dex