From a34bee0ec57bc3aa6d837167ee673aac0c3b71ba Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Thu, 8 Apr 2021 17:50:43 +0100 Subject: [PATCH] Don't plumb PRODUCT_*_CLASSPATH vars to make. They were used to generate export values for BOOTCLASSPATH and friends; which are now generated by derive_classpath service based on proto configs at runtime. Bug: 180105615 Test: m && launch_cvd; presubmit / DeviceBootTest Change-Id: Ifbf3f076a00e084d47a48180a4286fc53e610c5d --- java/dexpreopt_config.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 656f5ef71..0ab650287 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -236,9 +236,5 @@ func init() { } func dexpreoptConfigMakevars(ctx android.MakeVarsContext) { - ctx.Strict("PRODUCT_BOOTCLASSPATH", strings.Join(defaultBootclasspath(ctx), ":")) - ctx.Strict("PRODUCT_DEX2OAT_BOOTCLASSPATH", strings.Join(defaultBootImageConfig(ctx).getAnyAndroidVariant().dexLocationsDeps, ":")) - ctx.Strict("PRODUCT_SYSTEM_SERVER_CLASSPATH", strings.Join(systemServerClasspath(ctx), ":")) - ctx.Strict("DEXPREOPT_BOOT_JARS_MODULES", strings.Join(defaultBootImageConfig(ctx).modules.CopyOfApexJarPairs(), ":")) }