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

Commit c3c62fba authored by Colin Cross's avatar Colin Cross
Browse files

Don't zip hiddenapi output jar into jar 

Zip classes*.dex so that the jar does not contain an empty
classes.jar.

Test: m out/target/common/obj/JAVA_LIBRARIES/android.test.base.impl_intermediates/javalib.jar
Change-Id: I53bdd2035b2963dd781734da64058c95e1cff9d4
parent 4d36fcba

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2739,7 +2739,7 @@ $(call hiddenapi-copy-dex-files,\ 
$(2): OUTPUT_DIR := $(dir $(call hiddenapi-soong-output-dex,$(2)))

$(2): OUTPUT_JAR := $(dir $(call hiddenapi-soong-output-dex,$(2)))classes.jar

$(2): $(1) $(call hiddenapi-soong-output-dex,$(2)) | $(SOONG_ZIP) $(MERGE_ZIPS)

	$(SOONG_ZIP) -o $${OUTPUT_JAR} -C $${OUTPUT_DIR} -D $${OUTPUT_DIR}

	$(SOONG_ZIP) -o $${OUTPUT_JAR} -C $${OUTPUT_DIR} -f "$${OUTPUT_DIR}/classes*.dex"

	$(MERGE_ZIPS) -D -zipToNotStrip $${OUTPUT_JAR} -stripFile "classes*.dex" $(2) $${OUTPUT_JAR} $(1)

endef