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

Commit f657ff1d authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Move the intermediate directory for ART boot images."

parents d9052d17 ea581fc9

java/dexpreopt_bootjars_test.go

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ func TestDexpreoptBootJars(t *testing.T) { 
	ruleFile := "boot-foo.art"



	expectedInputs := []string{

		"dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art",

		"dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.art",

		"dex_bootjars_input/foo.jar",

		"dex_bootjars_input/bar.jar",

		"dex_bootjars_input/baz.jar",

java/dexpreopt_config.go

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		frameworkModules := global.BootJars.CopyOf()

		frameworkModules.RemoveList(artModules)



		artSubdir := "apex/com.android.art/javalib"

		artSubdir := "apex/art_boot_images/javalib"

		frameworkSubdir := "system/framework"



		// ART config for the primary boot image in the ART apex.