Switch tests and aexecd to use libartd
Change-Id: I7b6b63f4e7b92da906b3104adfa7661c5912c295
diff --git a/build/Android.test.mk b/build/Android.test.mk
index ba314bd..ecd9d3e 100644
--- a/build/Android.test.mk
+++ b/build/Android.test.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+ART_HOST_TEST_EXECUTABLES :=
+ART_TARGET_TEST_EXECUTABLES :=
+
# $(1): target or host
# $(2): file name with .cc or .cc.arm extension
define build-art-test
@@ -27,7 +30,7 @@
LOCAL_SRC_FILES := $(2)
LOCAL_CFLAGS := $(ART_CFLAGS)
LOCAL_C_INCLUDES += external/gtest/include
- LOCAL_SHARED_LIBRARIES := libarttest libart
+ LOCAL_SHARED_LIBRARIES := libarttest libartd
ifeq ($(1),target)
LOCAL_SHARED_LIBRARIES += libstlport
LOCAL_STATIC_LIBRARIES := libgtest libgtest_main
@@ -39,6 +42,11 @@
else
include $(BUILD_HOST_EXECUTABLE)
endif
+ ifeq ($(1),target)
+ ART_TARGET_TEST_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ else
+ ART_HOST_TEST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ endif
endef
$(foreach file,$(TEST_TARGET_SRC_FILES), $(eval $(call build-art-test,target,$(file))))