Fix test-art-target-oat for multi target

Avoids running dalvikvm with 32-bit native library. When the primary target is
64-bit, dalvikvm is a symlink to dalvikvm64 which can't load 32-bit native
library.

Bug: 15131102
Change-Id: I29c2f3b5a62b5f507674f3f6d1b9f3f2e5a9de23
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 3961219..ae54efb 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -147,8 +147,6 @@
 2ND_TARGET_ARCH := $(TARGET_2ND_ARCH)
 ART_PHONY_TEST_TARGET_SUFFIX :=
 2ND_ART_PHONY_TEST_TARGET_SUFFIX :=
-ART_TARGET_BINARY_SUFFIX :=
-2ND_ART_TARGET_BINARY_SUFFIX :=
 ifdef TARGET_2ND_ARCH
   art_test_primary_suffix :=
   art_test_secondary_suffix :=
@@ -156,7 +154,6 @@
     art_test_primary_suffix := 64
     ART_PHONY_TEST_TARGET_SUFFIX := 64
     2ND_ART_PHONY_TEST_TARGET_SUFFIX := 32
-    ART_TARGET_BINARY_SUFFIX := 64
     ART_TARGET_ARCH_32 := $(TARGET_2ND_ARCH)
     ART_TARGET_ARCH_64 := $(TARGET_ARCH)
   else
diff --git a/test/Android.mk b/test/Android.mk
index 71f6be1..8caa033 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -116,7 +116,7 @@
 test-art-target-oat-$(1)$($(2)ART_PHONY_TEST_TARGET_SUFFIX): $(ART_TEST_OUT)/oat-test-dex-$(1).jar test-art-target-sync
 	adb shell touch $(ART_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@
 	adb shell rm $(ART_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@
-	adb shell sh -c "/system/bin/dalvikvm$($(2)ART_TARGET_BINARY_SUFFIX) $(DALVIKVM_FLAGS) -XXlib:libartd.so -Ximage:$(ART_TEST_DIR)/core.art -classpath $(ART_TEST_DIR)/oat-test-dex-$(1).jar -Djava.library.path=$(ART_TEST_DIR)/$(TARGET_$(2)ARCH) $(1) && touch $(ART_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@"
+	adb shell sh -c "/system/bin/dalvikvm$($(2)ART_PHONY_TEST_TARGET_SUFFIX) $(DALVIKVM_FLAGS) -XXlib:libartd.so -Ximage:$(ART_TEST_DIR)/core.art -classpath $(ART_TEST_DIR)/oat-test-dex-$(1).jar -Djava.library.path=$(ART_TEST_DIR)/$(TARGET_$(2)ARCH) $(1) && touch $(ART_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@"
 	$(hide) (adb pull $(ART_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@ /tmp/ && echo $$@ PASSED) || (echo $$@ FAILED && exit 1)
 	$(hide) rm /tmp/$$@
 endef