Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ca9e6f authored by Guang Zhu's avatar Guang Zhu
Browse files

follow up jar manifest change for ENABLE_INCREMENTALJAVAC 

Change-Id: Id3df078691cfe5e9221ec5085a6b02ac6b6bb008
parent 9b281056

core/definitions.mk

+6 −2
Original line number Diff line number Diff line
@@ -1572,8 +1572,12 @@ $(if $(PRIVATE_JAR_PACKAGES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -m 
        -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