update emma build path due to libcore location change
Change-Id: Ib9484dd4caca75ae662be9baa887adb387f583fc
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 0602a5b..a9d94b2 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -67,8 +67,8 @@
LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
ifeq ($(EMMA_INSTRUMENT),true)
-LOCAL_SRC_FILES += $(call all-java-files-under, ../../external/emma/core ../../external/emma/pregenerated)
-LOCAL_JAVA_RESOURCE_DIRS += ../../external/emma/core/res ../../external/emma/pregenerated/res
+LOCAL_SRC_FILES += $(call all-java-files-under, ../external/emma/core ../external/emma/pregenerated)
+LOCAL_JAVA_RESOURCE_DIRS += ../external/emma/core/res ../external/emma/pregenerated/res
endif
LOCAL_NO_STANDARD_LIBRARIES := true
@@ -161,6 +161,10 @@
LOCAL_DX_FLAGS := --core-library
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := core-tests
+
+LOCAL_NO_EMMA_INSTRUMENT := true
+LOCAL_NO_EMMA_COMPILE := true
+
include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS)