diff options
| author | Colin Cross <ccross@android.com> | 2018-10-08 22:04:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-08 22:04:59 +0000 |
| commit | f05a023a5a1c07e705fd03a9bd6ffd86d6f81a9e (patch) | |
| tree | 2a13d1550a94d2c8cba7ed137a4453658e08b7dd | |
| parent | 159693a3e599077ad21c0d0677225e5b47502956 (diff) | |
| parent | c3c62fba966cc6e8aec647a340ba2a1d1d9ca096 (diff) | |
| download | build-f05a023a5a1c07e705fd03a9bd6ffd86d6f81a9e.tar.gz | |
Merge "Don't zip hiddenapi output jar into jar"
| -rw-r--r-- | core/definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 50e98b261b..34f6ed76d2 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 |