commit 1086e604b97a564550fa3abfd04fa7d1d2da39d0
author Nicolas Geoffray <ngeoffray@google.com> Wed Jan 20 14:30:40 2021 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 20 14:31:32 2021 +0000
tree f4f00d37afd5e2c6d2ba2398248422f2088a8c97
parent 4d31a041c75525ffb526376792760622b081e9e1

dexpreopt: Use the dirty-image-objects path from frameworks/base.

Test: m
Bug: 176171716
Change-Id: Ifbc08ae03e2b1bec7161948970bd197386e3b305

java/dexpreopt_bootjars.go

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 062005b..950d135 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -622,8 +622,10 @@
 		cmd.FlagWithInput("--profile-file=", profile)
 	}
 
-	if global.DirtyImageObjects.Valid() {
-		cmd.FlagWithInput("--dirty-image-objects=", global.DirtyImageObjects.Path())
+	dirtyImageFile := "frameworks/base/config/dirty-image-objects"
+	dirtyImagePath := android.ExistentPathForSource(ctx, dirtyImageFile)
+	if dirtyImagePath.Valid() {
+		cmd.FlagWithInput("--dirty-image-objects=", dirtyImagePath.Path())
 	}
 
 	if image.extends != nil {