summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-06-24 21:08:21 +0200
committerJean-Marie Henaff <jmhenaff@google.com>2015-06-25 12:08:40 +0200
commit03618293fef22deb63e7c83f6c98e39013f82319 (patch)
tree7f8b26ba1050b7008458cf6fa4665649096e618f
parent0232e1b831b52fb17261ac38ea912a0b9204249a (diff)
downloadtoolchain_jill-03618293fef22deb63e7c83f6c98e39013f82319.zip
toolchain_jill-03618293fef22deb63e7c83f6c98e39013f82319.tar.gz
toolchain_jill-03618293fef22deb63e7c83f6c98e39013f82319.tar.bz2
Add missing packaging of version.properties
(cherry picked from commit 5f8fce2aedd030fe4c9579484a6882e78848e793) Change-Id: I987af9f2fd25bff7d2eda88abf2b6544eceff117
-rw-r--r--jill/Android.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/jill/Android.mk b/jill/Android.mk
index 5a1cea8..4c3d9c1 100644
--- a/jill/Android.mk
+++ b/jill/Android.mk
@@ -33,8 +33,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
args4j-jack \
schedlib
+JILL_VERSION_FILE := $(call local-intermediates-dir,COMMON)/generated.version/jill-version.properties
+LOCAL_JAVA_RESOURCE_FILES += $(JILL_VERSION_FILE)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(JILL_VERSION_FILE)
+
include $(BUILD_HOST_JAVA_LIBRARY)
+$(JILL_VERSION_FILE): $(TOP_DIR)$(LOCAL_PATH)/../version.properties | $(ACP)
+ $(copy-file-to-target)
+
# Include this library in the build server's output directory
$(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):jill.jar)