diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2013-08-21 11:46:49 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-23 10:23:16 -0700 |
| commit | 808558f781b25d785e31c409a4cac991f5bd81b8 (patch) | |
| tree | 46660fab99eaf411332a1ecd0b384397a54f6ded /JavaLibrary.mk | |
| parent | a48bdc23fc37b44ded3618a96d274d04c9eb6aab (diff) | |
| download | libcore-808558f781b25d785e31c409a4cac991f5bd81b8.zip libcore-808558f781b25d785e31c409a4cac991f5bd81b8.tar.gz libcore-808558f781b25d785e31c409a4cac991f5bd81b8.tar.bz2 | |
create a separate lib for jsr166.
Bug: 10390711
(cherry picked from commit d47cd7206917560c7f522ede128490819a96b143)
Change-Id: I2646530dad175e2efe81b3f926a4d78a901f76ee
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 673c0bf..797dfee 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -130,6 +130,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 |