diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-18 18:30:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-18 18:30:05 -0700 |
| commit | 32c5a5cc36d44d52e314a82baa46d74a385bf6b9 (patch) | |
| tree | 35cca7ccc5c15e4039ff04e2cc8546d38c99783a /JavaLibrary.mk | |
| parent | a51183e3bc41840a33b75eb5c7266b93c7a6fdb9 (diff) | |
| parent | ca5c576d5863496bf81eb8916ea5c03f5b12fd90 (diff) | |
| download | libcore-32c5a5cc36d44d52e314a82baa46d74a385bf6b9.tar.gz libcore-32c5a5cc36d44d52e314a82baa46d74a385bf6b9.tar.bz2 libcore-32c5a5cc36d44d52e314a82baa46d74a385bf6b9.zip | |
am ca5c576d: Merge "Fix LIBCORE_SKIP_TESTS without causing warnings."
* commit 'ca5c576d5863496bf81eb8916ea5c03f5b12fd90':
Fix LIBCORE_SKIP_TESTS without causing warnings.
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 880ac1c38..039509b04 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -91,6 +91,7 @@ core-intermediates := ${intermediates} # Make the core-tests library. +ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) @@ -98,10 +99,10 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-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 @@ -145,6 +146,7 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(BUILD_HOST_JAVA_LIBRARY) # Make the core-tests library. + ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) @@ -157,6 +159,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) + endif endif # |