From 630c32b92bf3cc6179c211290016089d40319119 Mon Sep 17 00:00:00 2001 From: Shubham Ajmera Date: Thu, 3 Nov 2016 13:41:03 +0000 Subject: Correct dependencies for junit-param Set LOCAL_NO_STANDARD_LIBRARIES to true and explicitly listed the dependencies. As LOCAL_NO_STANDARD_LIBRARIES flag was not set to true, some of the modules in frameworks(ext) were added as dependencies. ART bot doesn't support frameworks modules and therefore, it was breaking their build. Test: make junit-params-host junit-params-hostdex junit-params \ junit-params-test Change-Id: I24068aec64cd301ef542ee9dbb9db505eff8b857 --- Android.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Android.mk b/Android.mk index 2870d1f..515d2e2 100644 --- a/Android.mk +++ b/Android.mk @@ -21,6 +21,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) LOCAL_MODULE := junit-params-host +LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ junit @@ -31,7 +32,9 @@ include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) LOCAL_MODULE := junit-params-hostdex +LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex LOCAL_STATIC_JAVA_LIBRARIES := \ junit4-target-hostdex include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) @@ -43,7 +46,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) LOCAL_MODULE := junit-params +LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_STATIC_JAVA_LIBRARIES := \ junit4-target include $(BUILD_STATIC_JAVA_LIBRARY) @@ -61,7 +66,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) LOCAL_JAVA_RESOURCE_DIRS := src/test/resources LOCAL_MODULE := junit-params-test +LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := core-oj core-libart junit-targetdex LOCAL_STATIC_JAVA_LIBRARIES := \ junit-params \ junit-params-assertj-core -- cgit v1.2.3