commit 9ce33353c5eba4610957b2a98fd0dc1fddc1596b
author Nicolas Geoffray <ngeoffray@google.com> Tue Feb 26 20:38:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 26 20:38:32 2019 +0000
tree ede7ad0a1c4f3671a5e7c066c8b3ab6d565cd812
parent b42c1aa8e43e9ac118ba8366b785daf650d796fa
parent 07b4007f1dc184a5ac4117e4fa5e4c3c9acd2a05

Merge "Add a DEX2OAT_BOOTCLASSPATH variable."

java/dexpreopt_config.go

diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 31a3e26..280b601 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -196,6 +196,7 @@
 
 func dexpreoptConfigMakevars(ctx android.MakeVarsContext) {
 	ctx.Strict("PRODUCT_BOOTCLASSPATH", strings.Join(defaultBootclasspath(ctx), ":"))
+	ctx.Strict("PRODUCT_DEX2OAT_BOOTCLASSPATH", strings.Join(defaultBootImageConfig(ctx).dexLocations, ":"))
 	ctx.Strict("PRODUCT_SYSTEM_SERVER_CLASSPATH", strings.Join(systemServerClasspath(ctx), ":"))
 
 	ctx.Strict("DEXPREOPT_BOOT_JARS_MODULES", strings.Join(defaultBootImageConfig(ctx).modules, ":"))