From 3c5a18fc16235a58248bf505ca216b7946c63a78 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 2 Oct 2019 18:13:19 +0100 Subject: [PATCH] Document SYSTEM_OTHER_ODEX_FILTER matching ...and add a CleanSpec for the moving preopt files. Bug: 141707536 Test: N/A Change-Id: I2f5bc4e2c8e6a9fa4c562d55623c13682d3f93ba --- CleanSpec.mk | 3 +++ core/dex_preopt_config.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 4e06d8024..8219afcd0 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -678,6 +678,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex) +# Migrate preopt files to system_other for some devices +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/*app/*/oat) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 69eaea1d7..cfe918ffb 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -4,7 +4,8 @@ DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config DEX_PREOPT_DEFAULT ?= true # The default filter for which files go into the system_other image (if it is -# being used). To bundle everything one should set this to '%' +# being used). Note that each pattern p here matches both '/

' and /system/

'. +# To bundle everything one should set this to '%'. SYSTEM_OTHER_ODEX_FILTER ?= \ app/% \ priv-app/% \