commit 5c9a1a40642cb5954f60865661d3b78904f7354a
author Guang Zhu <guangzhu@google.com> Tue Sep 24 19:05:52 2013 -0700
committer Guang Zhu <guangzhu@google.com> Wed Sep 25 10:50:23 2013 -0700
tree a41072f9b07a48bfec7e6bfe59807d93955921c7
parent 8dcb53c691366c2e8c6b844ec870edc7d58ce51c

enable embeded build number in jar manifest

* if a module uses LOCAL_JAR_MANIFEST
* if the manifest file has the string '%BUILD_NUMBER%' in it

Bug: 10793010

Change-Id: I1ed3dae0706e6ad26c2bce68269c1abb7b4a7325

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index f27c771..c429f9d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1516,8 +1516,12 @@
         -not -path $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))) \
     | xargs rm -rf)
 $(if $(PRIVATE_RMTYPEDEFS), $(hide) $(RMTYPEDEFS) -v $(PRIVATE_CLASS_INTERMEDIATES_DIR))
-$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
-    $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
+$(if $(PRIVATE_JAR_MANIFEST), \
+    $(hide) sed -e 's/%BUILD_NUMBER%/$(BUILD_NUMBER)/' \
+            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf && \
+        jar -cfm $@ $(dir $@)/manifest.mf \
+            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \
+    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)
 endef
 
 define transform-java-to-classes.jar