Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a34bee0e authored by Artur Satayev's avatar Artur Satayev Committed by satayev
Browse files

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
parent ed9c17d0

java/dexpreopt_config.go

+0 −4
Original line number Diff line number Diff line
@@ -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(), ":"))

}