Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline"

am: 6f2cfd93d8

Change-Id: If734c0b555c74b15bb10906ad590bd882b6542e6
This commit is contained in:
Anton Hansson 2018-11-20 02:24:21 -08:00 committed by android-build-merger
commit 366dd21d79
2 changed files with 6 additions and 0 deletions

View file

@ -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
# ************************************************

View file

@ -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