diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-16 19:59:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 19:59:06 +0000 |
| commit | 7e34bd4a4d10bb394fb04ee4cbd169ef36576a87 (patch) | |
| tree | 66fb91f2a1b83c7893528562efc52dc9a9805dbe /JavaLibrary.mk | |
| parent | 4f1fadcbb1c8766e737ee810e8888c6a5ae82e36 (diff) | |
| parent | 2c0ffd5f475716e747e4fd47bc8f7996ad8d1b56 (diff) | |
| download | libcore-7e34bd4a4d10bb394fb04ee4cbd169ef36576a87.zip libcore-7e34bd4a4d10bb394fb04ee4cbd169ef36576a87.tar.gz libcore-7e34bd4a4d10bb394fb04ee4cbd169ef36576a87.tar.bz2 | |
am 2c0ffd5f: Merge "Only bother building the host tests for Linux."
* commit '2c0ffd5f475716e747e4fd47bc8f7996ad8d1b56':
Only bother building the host tests for Linux.
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 57a8f82..010fb66 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -145,6 +145,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): $(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE) # Build for the host. # +ifeq ($(HOST_OS),linux) + include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-main-java-files-under, dex) LOCAL_MODULE_TAGS := optional @@ -193,6 +195,8 @@ ifeq ($(LIBCORE_SKIP_TESTS),) include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif +endif # HOST_OS == linux + # # Local droiddoc for faster libcore testing # |