From 863f3b9fb448c279553e62e56cc12f2c9f8cd509 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 24 Feb 2021 21:09:59 +0000 Subject: [PATCH] Stop using '&' for class loader context. Test: m Bug: 132357300 Change-Id: I01a5008d5b84820f793c1c23fe2e4c4687cf4acf --- dexpreopt/dexpreopt.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index b0a684eed..e17d756c0 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -287,12 +287,9 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g } else { // Other libraries or APKs for which the exact list is unknown. - // Pass special class loader context to skip the classpath and collision check. - // This will get removed once LOCAL_USES_LIBRARIES is enforced. - // Right now LOCAL_USES_LIBRARIES is opt in, for the case where it's not specified we still default - // to the &. + // We assume the class loader context is empty. rule.Command(). - Text(`class_loader_context_arg=--class-loader-context=\&`). + Text(`class_loader_context_arg=--class-loader-context=PCL[]`). Text(`stored_class_loader_context_arg=""`) }