Fix build warnings for x86+arm targets
This likely doesn't fix all of the issues, but it at least removes the
pages of overriding command warnings for these configurations.
Test: lunch aosp_x86_arm-eng; m nothing
Test: build-aosp_arm.ninja is identical
Test: build-aosp_arm64.ninja is identical
Change-Id: Iacdfd56d098eec08cf588c98ca00c7c7e10c6261
diff --git a/Android.mk b/Android.mk
index e4f4e74..47bcaac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -298,7 +298,7 @@
$(hide) $(call ART_TEST_PREREQ_FINISHED,$@)
# Secondary target architecture variants:
-ifdef TARGET_2ND_ARCH
+ifdef 2ND_ART_PHONY_TEST_TARGET_SUFFIX
.PHONY: test-art-target$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)
test-art-target$(2ND_ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-gtest$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) \
test-art-target-run-test$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)
diff --git a/build/Android.common.mk b/build/Android.common.mk
index b0fa124..a6a9f0f 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -59,8 +59,6 @@
ART_PHONY_TEST_TARGET_SUFFIX := 64
2ND_ART_PHONY_TEST_TARGET_SUFFIX := 32
else
- # TODO: ???
- $(warning Do not know what to do with this multi-target configuration!)
ART_PHONY_TEST_TARGET_SUFFIX := 32
2ND_ART_PHONY_TEST_TARGET_SUFFIX :=
endif
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 7ca7409..920c3b9 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -688,7 +688,7 @@
ifeq ($(ART_BUILD_TARGET),true)
$(foreach file,$(ART_TARGET_GTEST_FILES), $(eval $(call define-art-gtest-target,$(file),)))
- ifdef TARGET_2ND_ARCH
+ ifdef 2ND_ART_PHONY_TEST_TARGET_SUFFIX
$(foreach file,$(2ND_ART_TARGET_GTEST_FILES), $(eval $(call define-art-gtest-target,$(file),2ND_)))
endif
# Rules to run the different architecture versions of the gtest.
@@ -748,7 +748,7 @@
$(eval $(call define-test-art-gtest-combination,target,TARGET,valgrind-,))
$(eval $(call define-test-art-gtest-combination,target,TARGET,,$(ART_PHONY_TEST_TARGET_SUFFIX)))
$(eval $(call define-test-art-gtest-combination,target,TARGET,valgrind-,$(ART_PHONY_TEST_TARGET_SUFFIX)))
-ifdef TARGET_2ND_ARCH
+ifdef 2ND_ART_PHONY_TEST_TARGET_SUFFIX
$(eval $(call define-test-art-gtest-combination,target,TARGET,,$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)))
$(eval $(call define-test-art-gtest-combination,target,TARGET,valgrind-,$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)))
endif
