summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-06-24 17:57:44 +0200
committerJean-Marie Henaff <jmhenaff@google.com>2015-06-25 12:03:03 +0200
commit02d42f60c163fd1a44c093035490e6647154093a (patch)
tree34b8ce304fa08a762bae64486509aa2691625e6e
parent6ae7b187f9d03d85bd4bd7b4dd34a20d8cce9766 (diff)
downloadtoolchain_jack-02d42f60c163fd1a44c093035490e6647154093a.tar.gz
toolchain_jack-02d42f60c163fd1a44c093035490e6647154093a.tar.bz2
toolchain_jack-02d42f60c163fd1a44c093035490e6647154093a.zip
Add missing jack-version.properties packaging in Android.mk
(cherry picked from commit 61413359d59bd38c20355475b23fed83590fb6a9) Change-Id: I58d4b5b50b9ed28f88c2f80be593d6f43d0ed0fe
-rw-r--r--jack/Android.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/jack/Android.mk b/jack/Android.mk
index 6b1d7dea..dee2158e 100644
--- a/jack/Android.mk
+++ b/jack/Android.mk
@@ -122,7 +122,15 @@ LOCAL_JAVA_LIBRARIES := \
allocation-jack \
$(JACK_STATIC_JAVA_LIBRARIES)
+JACK_VERSION_FILE := $(call local-intermediates-dir,COMMON)/generated.version/jack-version.properties
+LOCAL_JAVA_RESOURCE_FILES += $(JACK_VERSION_FILE)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(JACK_VERSION_FILE)
+
include $(BUILD_HOST_JAVA_LIBRARY)
+
+$(JACK_VERSION_FILE): $(TOP_DIR)$(LOCAL_PATH)/../version.properties
+ $(copy-file-to-target)
+
$(LOCAL_INSTALLED_MODULE) : $(jack_script) $(jack_admin_script)
INSTALLED_JACK_NOSERVER := $(LOCAL_INSTALLED_MODULE)
JACK_JAR_INTERMEDIATE:=$(LOCAL_BUILT_MODULE).intermediate.jar