commit 65ca9e6f02652cb80f050dd03984ab9631683756
author Guang Zhu <guangzhu@google.com> Wed Sep 25 15:27:20 2013 -0700
committer Guang Zhu <guangzhu@google.com> Wed Sep 25 15:27:20 2013 -0700
tree 5317cc393ecb48ca9edaf3cebc7c55e2cdf35223
parent 9b2810568e55d0ba503b251bb110f04de01d011a

follow up jar manifest change for ENABLE_INCREMENTALJAVAC

Change-Id: Id3df078691cfe5e9221ec5085a6b02ac6b6bb008

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index c429f9d..81f744c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1572,8 +1572,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) .)
 $(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp
 endef