summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2016-04-04 23:50:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-04 23:50:46 +0000
commit2bd1f6b7296ac1ad55a4c4c2789f8fd85cfdf986 (patch)
treef92c7512dd349275d3c0f5a27546f57fa34085d6
parent7f95581d269e0815eab16115f0e36c0ee325dc88 (diff)
parentf1f7174e90c28231e99842913be94badef936d0c (diff)
downloadplatform_external_jcommander-2bd1f6b7296ac1ad55a4c4c2789f8fd85cfdf986.tar.gz
platform_external_jcommander-2bd1f6b7296ac1ad55a4c4c2789f8fd85cfdf986.tar.bz2
platform_external_jcommander-2bd1f6b7296ac1ad55a4c4c2789f8fd85cfdf986.zip
build: Add device-side support for the AOSP. am: 498658d
am: f1f7174 * commit 'f1f7174e90c28231e99842913be94badef936d0c': build: Add device-side support for the AOSP. Change-Id: I56203abb213d1c0d86c72e1e34f2c497ad7b1de4
-rw-r--r--Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 76f2f8b..141db39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,12 +27,21 @@ jcommander_all_src_files := $(call all-java-files-under, src/main)
# Filter out PathConverter since android is missing java.nio.file APIs.
jcommander_android_src_files := $(filter-out %/PathConverter.java,$(jcommander_all_src_files))
+# Target Java build
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(jcommander_android_src_files)
+LOCAL_MODULE := jcommander
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# Host Java build
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(jcommander_all_src_files)
LOCAL_MODULE := jcommander-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_JAVA_LIBRARY)
+# Host dalvik build
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(jcommander_android_src_files)
LOCAL_MODULE := jcommander-hostdex