From 648b0a875ea2f55da33c21a8a92b16030a98f513 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 24 Aug 2018 14:56:58 +0100 Subject: [PATCH] Install /system/product_services apps odex in system-other. This will cause odex/vdex files for apps installed under /system/product_services/{priv-,}app to be installed in system-other instead of next to the APKs themselves. This change is analogous to I63406f91acc3de4b4f142767e28d45308706c7da, which was for /system/product apps. Test: diff installed-files{,-system-other}.txt on pixel with a PS app Bug: 80741439 Change-Id: I79fac41cb665a649028f1f0e30350d42e8b80598 --- core/dex_preopt.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index a7caac1ea..8299988a7 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -21,7 +21,13 @@ 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 '%' -SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/% product/app/% product/priv-app/% +SYSTEM_OTHER_ODEX_FILTER ?= \ + app/% \ + priv-app/% \ + product_services/app/% \ + product_services/priv-app/% \ + product/app/% \ + product/priv-app/% \ # Method returning whether the install path $(1) should be for system_other. # Under SANITIZE_LITE, we do not want system_other. Just put things under /data/asan.