diff options
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 64f99d8..a731aee 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null) endef # The Java files and their associated resources. -core_src_files := $(call all-main-java-files-under,dalvik dom json luni openssl support xml ../external/bouncycastle) +core_src_files := $(call all-main-java-files-under,dalvik dom json luni support xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) @@ -151,6 +151,7 @@ LOCAL_NO_STANDARD_LIBRARIES := true # libraries. # TODO: we should have a bogus module that just contains tests.AllTests for speed. LOCAL_JAVA_LIBRARIES := \ + bouncycastle \ core \ core-junit \ core-junitrunner \ @@ -172,7 +173,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner +LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit core-junitrunner LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-support @@ -193,7 +194,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner +LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit core-junitrunner LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-supportlib |