From c0c98d51d6c1fb68144b4a8e68df196554ea93c2 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Mon, 9 Mar 2020 12:46:06 +0000 Subject: [PATCH] Set '--force-determinism' option for boot image compilation. Test: aosp_walleye-userdebug boots. Change-Id: I0edf7fbfe18ea2f3d1cfda5138a48bdc1420aa6a Bug: 150934453 --- java/dexpreopt_bootjars.go | 1 + 1 file changed, 1 insertion(+) diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index d7adb4051..6ec919c93 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -379,6 +379,7 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant FlagWithArg("--instruction-set-features=", global.InstructionSetFeatures[arch]). FlagWithArg("--android-root=", global.EmptyDirectory). FlagWithArg("--no-inline-from=", "core-oj.jar"). + Flag("--force-determinism"). Flag("--abort-on-hard-verifier-error") if global.BootFlags != "" {