diff options
| author | Guang Zhu <guangzhu@google.com> | 2010-06-13 14:59:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-13 14:59:44 -0700 |
| commit | 45628e322302f4f5cbf19f9d813d29411f069f7e (patch) | |
| tree | 6e2f04f3662643d263bfa0feb68c09c44b9ff998 /JavaLibrary.mk | |
| parent | feeb94d4b4fa0b0a4a6e89569162e84705c30604 (diff) | |
| parent | 83244e5bec9d489a097251c3df8cd22b36f4f648 (diff) | |
| download | libcore-45628e322302f4f5cbf19f9d813d29411f069f7e.zip libcore-45628e322302f4f5cbf19f9d813d29411f069f7e.tar.gz libcore-45628e322302f4f5cbf19f9d813d29411f069f7e.tar.bz2 | |
am 83244e5b: update emma build path due to libcore location change
Merge commit '83244e5bec9d489a097251c3df8cd22b36f4f648' into dalvik-dev
* commit '83244e5bec9d489a097251c3df8cd22b36f4f648':
update emma build path due to libcore location change
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index a51f233..391f29e 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -67,8 +67,8 @@ LOCAL_SRC_FILES := $(core_src_files) 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_JAVA_LIBRARIES := \ 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) |