diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-23 11:09:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-23 11:09:38 -0700 |
| commit | 7284d3e610fad717da531ea80d5b74d67a7fdbbd (patch) | |
| tree | 29fda5344e93c0e7b3b53ba32c82829df7541319 /JavaLibrary.mk | |
| parent | b6e231d78e8d5a2b05c07008fdb46e8816d72e70 (diff) | |
| parent | a534d5004e8ef8bfab280b3027b6bb9934da8a31 (diff) | |
| download | libcore-7284d3e610fad717da531ea80d5b74d67a7fdbbd.zip libcore-7284d3e610fad717da531ea80d5b74d67a7fdbbd.tar.gz libcore-7284d3e610fad717da531ea80d5b74d67a7fdbbd.tar.bz2 | |
am a534d500: Merge "create a separate lib for jsr166. Bug: 10390711"
* commit 'a534d5004e8ef8bfab280b3027b6bb9934da8a31':
create a separate lib for jsr166. Bug: 10390711
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 5bdfb01..01f0bf4 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -138,6 +138,19 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_STATIC_JAVA_LIBRARY) endif +ifeq ($(LIBCORE_SKIP_TESTS),) +# Make the jsr166-tests library. +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-test-java-files-under, jsr166-tests) +LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core core-junit +LOCAL_JAVACFLAGS := $(local_javac_flags) +LOCAL_MODULE := jsr166-tests +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk +include $(BUILD_STATIC_JAVA_LIBRARY) +endif + # This one's tricky. One of our tests needs to have a # resource with a "#" in its name, but Perforce doesn't # allow us to submit such a file. So we create it here |