diff options
| author | Anton Hansson <hansson@google.com> | 2018-11-20 10:05:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-20 10:05:27 +0000 |
| commit | 6f2cfd93d8ae5a5faac0d305778ed1147c474b54 (patch) | |
| tree | 415ffd19302efb305de7ba70cd56fe7542f633e5 | |
| parent | 38d08510f8b2f405e08fb2ab9273c4755bb66a1c (diff) | |
| parent | adbafe0a7cb9eb2ae47f5aac62f74d64afe21583 (diff) | |
| download | build-6f2cfd93d8ae5a5faac0d305778ed1147c474b54.tar.gz | |
Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline"
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | target/board/mainline_arm64/BoardConfig.mk | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7d42fc953b..a4b7c26481 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -517,6 +517,8 @@ $(call add-clean-step, rm -f $(OUT_DIR)/build-*-dist*.ninja) $(call add-clean-step, rm -f $(HOST_OUT)/*ts/host-libprotobuf-java-*.jar) +$(call add-clean-step, find $(OUT_DIR)/target/product/mainline_arm64/system -type f -name "*.*dex" -print0 | xargs -0 rm -f) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/target/board/mainline_arm64/BoardConfig.mk b/target/board/mainline_arm64/BoardConfig.mk index 906a5665d8..936c5a0d43 100644 --- a/target/board/mainline_arm64/BoardConfig.mk +++ b/target/board/mainline_arm64/BoardConfig.mk @@ -24,4 +24,8 @@ TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := generic +# Puts odex files on system_other, as well as causing dex files not to get +# stripped from APKs. +BOARD_USES_SYSTEM_OTHER_ODEX := true + include build/make/target/board/BoardConfigGsiCommon.mk |