diff options
author | Igor Murashkin <iam@google.com> | 2016-03-23 03:44:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-23 03:44:01 +0000 |
commit | a000ca75a6f61f02b247066d340156f7205d5e66 (patch) | |
tree | 5714e4925721cf52a12011499363e3a086bbb10b | |
parent | a76e1a45046e1a73359c0886d459b53c3930153f (diff) | |
parent | c53d895c7a1b7223f2f3bfe06d39e87f5d42052b (diff) | |
download | platform_external_jsr305-a000ca75a6f61f02b247066d340156f7205d5e66.tar.gz platform_external_jsr305-a000ca75a6f61f02b247066d340156f7205d5e66.tar.bz2 platform_external_jsr305-a000ca75a6f61f02b247066d340156f7205d5e66.zip |
Merge "build: Add host-side dalvik library rules"
am: c53d895
* commit 'c53d895c7a1b7223f2f3bfe06d39e87f5d42052b':
build: Add host-side dalvik library rules
-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) |