diff options
| author | Igor Murashkin <iam@google.com> | 2016-03-22 21:11:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-22 21:11:33 +0000 |
| commit | c53d895c7a1b7223f2f3bfe06d39e87f5d42052b (patch) | |
| tree | 6bcb9f9237da547225d0789018e55c8b9e381e4f | |
| parent | ed2d3938efee97e6316b849759dc913cbc831f95 (diff) | |
| parent | 9f3544c5c0bfcb7e8ad6b8a7e225c3f718c63b7c (diff) | |
| download | platform_external_jsr305-c53d895c7a1b7223f2f3bfe06d39e87f5d42052b.tar.gz platform_external_jsr305-c53d895c7a1b7223f2f3bfe06d39e87f5d42052b.tar.bz2 platform_external_jsr305-c53d895c7a1b7223f2f3bfe06d39e87f5d42052b.zip | |
Merge "build: Add host-side dalvik library rules"android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -13,19 +13,22 @@ # limitations under the License. LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) +# Target library. +include $(CLEAR_VARS) LOCAL_MODULE := jsr305 LOCAL_SDK_VERSION := 8 LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) - include $(BUILD_STATIC_JAVA_LIBRARY) -# Also build a host side library +# Also build a host side library (Java) include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) - LOCAL_MODULE := jsr305lib - include $(BUILD_HOST_JAVA_LIBRARY) + +# Also build a host side library (Dalvik) +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) +LOCAL_MODULE := jsr305-hostdex +include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) |