commit cbd21b105cfd94632f07cb09e4391a6d0eefa75f
author Nicolas Geoffray <ngeoffray@google.com> Mon May 08 09:41:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 09:41:21 2017 +0000
tree 224191e96beee02748414da5fa780d9d2a9654ea
parent e3940b50f4fa8ae660d170953a8d3544a34ace0a
parent c120d8aa13a8cf351c747c84b47dd8328a947b6f

Merge "Pass --force-determinism to prebuilts." am: a65a41dcdb am: 5ebe0370bd
am: c120d8aa13

Change-Id: I6c23bc160c4d95335ee191efae13ee876eba06d0

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 8ee800b..9db5dbf 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -122,6 +122,7 @@
 	--runtime-arg -Xnorelocate --compile-pic \
 	--no-generate-debug-info --generate-build-id \
 	--abort-on-hard-verifier-error \
+	--force-determinism \
 	--no-inline-from=core-oj.jar \
 	$(PRIVATE_DEX_PREOPT_FLAGS) \
 	$(PRIVATE_ART_FILE_PREOPT_FLAGS) \