commit 2bd1f6b7296ac1ad55a4c4c2789f8fd85cfdf986
author Igor Murashkin <iam@google.com> Mon Apr 04 23:50:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 04 23:50:46 2016 +0000
tree f92c7512dd349275d3c0f5a27546f57fa34085d6
parent 7f95581d269e0815eab16115f0e36c0ee325dc88
parent f1f7174e90c28231e99842913be94badef936d0c

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

Android.mk

diff --git a/Android.mk b/Android.mk
index 76f2f8b..141db39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,12 +27,21 @@
 # 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