From 5bfe9267f8182fcceeaf364fa0a829f3861f3c53 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 29 Mar 2021 11:48:33 +0100 Subject: [PATCH] Preopt apps with updatable boot classpath too. Test: m Test: egrep 'ethernet-service[^ ]*odex' out/soong/build.ninja \ | grep updatable # is empty egrep 'oat-file=[^ ]*Gallery2[^ ]*odex' out/soong/build.ninja \ | egrep -o 'Xbootclasspath:[^ ]*' \ | sed 's/:/\n/g' \ | grep updatable_bootjars # lists updatable boot jars egrep -o 'Xbootclasspath:[^ ]*' \ -o `find out -name dexpreopt.sh | grep Dialer` \ | sed 's/:/\n/g' \ | grep updatable_bootjars # lists updatable boot jars Bug: 178467404 Change-Id: Ia5d4e59bac3e32bc77f1a0ab9e1abb18768a7ee7 --- core/dex_preopt_config.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 7c45646a38..2762b44296 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -47,9 +47,8 @@ SYSTEM_OTHER_ODEX_FILTER ?= \ product/app/% \ product/priv-app/% \ -# Global switch control if updatable boot jars are included in dexpreopt. -# Currently unconditionally set to true, this may change in the future. -DEX_PREOPT_WITH_UPDATABLE_BCP := false +# Global switch to control if updatable boot jars are included in dexpreopt. +DEX_PREOPT_WITH_UPDATABLE_BCP := true # Conditional to building on linux, as dex2oat currently does not work on darwin. ifeq ($(HOST_OS),linux)