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