commit 9cef3e597ebacef60adb1e7c62d516d19bc6f979
author Anton Hansson <hansson@google.com> Mon Oct 14 02:53:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 14 02:53:02 2019 -0700
tree 1bdc330e19685d0dc057dacfc5f5784fab1cd2e2
parent c58858de4c5de8c6fb9144b8f53a9b31a7db33d0
parent 2ce82aea1afaf24c75c8b05d9cbe31a336f94f93

Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394 am: bde786ca70
am: 2ce82aea1a

Change-Id: I2d387ec825dc3c91e94ab658b06848f9ea9af78f

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index bdd16d5..9d55ae5 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -682,6 +682,9 @@
 
 $(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
 # ************************************************

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 69eaea1..cfe918f 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -4,7 +4,8 @@
 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 '/<p>' and /system/<p>'.
+# To bundle everything one should set this to '%'.
 SYSTEM_OTHER_ODEX_FILTER ?= \
     app/% \
     priv-app/% \