Change build target for vogar to include building vogar.jar
Now "make vogar" should be sufficient.
(cherry-picked from commit 956aa496a47f93e07c05ef305c298d744153d61b)
Change-Id: I571b6d45bef5f177d84620be35d795e9cc1b885c
diff --git a/Android.mk b/Android.mk
index d4d8604..0e8d7cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,13 +20,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := vogar.jar
-
LOCAL_MODULE_TAGS := optional
-
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
intermediates := $(call local-intermediates-dir,COMMON)
-
LOCAL_SRC_FILES := $(call all-java-files-under, src/)
LOCAL_JAVA_RESOURCE_DIRS := resources
@@ -47,7 +43,6 @@
# because jack doesn't produce jar files for STATIC_JAVA_LIBRARIES,
# and produces its own intermediate representation instead.
LOCAL_JACK_ENABLED := disabled
-
include $(BUILD_STATIC_JAVA_LIBRARY)
# Build dependencies.
@@ -77,7 +72,7 @@
include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/bin/vogar-android | $(ACP)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/bin/vogar-android vogar.jar | $(ACP)
@echo "Copy: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-new-target)
$(hide) chmod 755 $@
