commit 4fd35a2a16484c4257777acbb6c3f3a2abc33c0a
author Ulya Trafimovich <skvadrik@google.com> Mon Mar 09 12:46:06 2020 +0000
committer Ulya Trafimovich <skvadrik@google.com> Wed Mar 11 10:24:49 2020 +0000
tree e8a6a671c62984aeb537740e80bbc4e73d01dc38
parent 5a3899b5c53f0c43ed9818adbbe4fc38e6fa9e9a

Set '--force-determinism' option for boot image compilation.

Test: aosp_walleye-userdebug boots.

Bug: 150934453

Change-Id: I0edf7fbfe18ea2f3d1cfda5138a48bdc1420aa6a
(cherry picked from commit c0c98d51d6c1fb68144b4a8e68df196554ea93c2)

java/dexpreopt_bootjars.go

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 655a476..489cbf2 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -376,6 +376,7 @@
 		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 != "" {