merge in ub-support-test-release history after reset to ub-support-test
diff --git a/Android.mk b/Android.mk
index b098edd..b66fefd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,6 +47,7 @@
# ----------------------------------
# build a junit-hostdex jar
+ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
LOCAL_SRC_FILES += $(core-junit-files)
@@ -54,6 +55,7 @@
LOCAL_MODULE := junit-hostdex
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+endif # HOST_OS == linux
# ----------------------------------
# build a core-junit target jar that is built into Android system image
@@ -74,6 +76,7 @@
# build a core-junit-hostdex jar that contains exactly the same classes
# as core-junit.
+ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
# TODO: remove extensions once apache-harmony/luni/ is no longer dependent
# on it
@@ -84,6 +87,7 @@
LOCAL_MODULE := core-junit-hostdex
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+endif # HOST_OS == linux
#-------------------------------------------------------
# build a junit-runner jar for the host JVM
diff --git a/build.gradle b/build.gradle
index 722846c..6e0a62e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,13 @@
}
}
+dependencies {
+ targetCompile getAndroidPrebuilt('4')
+ targetCompile project(':hamcrest')
+
+ hostCompile project(':hamcrest')
+}
+
task targetJar(type: Jar) {
from sourceSets.target.output
dependsOn targetClasses
@@ -48,23 +55,3 @@
host hostJar
target targetJar
}
-
-if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") {
- repositories {
- maven { url '../../prebuilts/tools/common/m2/repository' }
- }
-
- dependencies {
- targetCompile getAndroidPrebuilt('4')
- targetCompile 'org.hamcrest:hamcrest-core:1.1'
-
- hostCompile 'org.hamcrest:hamcrest-core:1.1'
- }
-} else {
- dependencies {
- targetCompile getAndroidPrebuilt('4')
- targetCompile project(':hamcrest')
-
- hostCompile project(':hamcrest')
- }
-}
