Merge "Fix various classpath issues in Jack projects" into jack-wip-dev
diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk
index 9c48dcf..776522b 100644
--- a/hamcrest-core/Android.mk
+++ b/hamcrest-core/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_MODULE := hamcrest-core-jack
+LOCAL_MODULE := hamcrest-core-hostdex-jack
 
 LOCAL_BUILD_HOST_DEX := true
 
@@ -27,3 +27,14 @@
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_JAVA_LIBRARY)
+
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE := hamcrest-core-jack
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/junit4/Android.mk b/junit4/Android.mk
index 89f3a07..aeb9366 100644
--- a/junit4/Android.mk
+++ b/junit4/Android.mk
@@ -33,7 +33,7 @@
 
 LOCAL_JAVA_LIBRARIES := core-hostdex
 
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-core-jack
+LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-core-hostdex-jack
 
 LOCAL_MODULE := junit4-hostdex-jack