aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShubham Ajmera <shubhamajmera@google.com>2016-11-04 16:26:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-04 16:26:22 +0000
commitf04dc66f6f0c48aa612171a316d020a8f9595d1f (patch)
treec3e3dfed954eaa2bc335fcbcc77dfe1baab5c2c7
parent6774bdc0447b72a618eab51772685010afd5647a (diff)
parent48ccb76667ee330d1f4e8cf18bb36ebb90a6a5e4 (diff)
downloadplatform_external_junit-params-f04dc66f6f0c48aa612171a316d020a8f9595d1f.tar.gz
platform_external_junit-params-f04dc66f6f0c48aa612171a316d020a8f9595d1f.tar.bz2
platform_external_junit-params-f04dc66f6f0c48aa612171a316d020a8f9595d1f.zip
Correct dependencies for junit-param am: 630c32b92b am: bdee35d507
am: 48ccb76667 Change-Id: Ie10ed98c46e922bcd2f8914998691be1bd4dafb5
-rw-r--r--Android.mk7
1 files changed, 7 insertions, 0 deletions
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