commit a596909342e7751f3c710efc26f2c5fe5a84ced0
author Jeongik Cha <jeongik@google.com> Fri May 07 18:53:21 2021 +0900
committer Jeongik Cha <jeongik@google.com> Fri May 07 21:40:23 2021 +0900
tree 4330822146021a505e8e10368b3736f2a78804e4
parent 882bcc1c1cf4af1c3712c7d9c4fea315a8a8d08d

Rename fields in dexpreopt config

Add 'host' into the name of fields regarding path on the host side to
distinguish between paths on the device(which will be added in the
following commit), and paths on the host.

Bug: 158843648
Test: build and flash, and then
  adb wait-for-device \
    && adb -s $S root \
    && adb -s $S logcat \
    | grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C 1
Change-Id: Ib2645ed51591ba2f4b726c115b401ad2bd6675da

dexpreopt/config.go

diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index 8a656ed..7a41861 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -130,9 +130,9 @@
 	ProvidesUsesLibrary            string       // library name (usually the same as module name)
 	ClassLoaderContexts            ClassLoaderContextMap
 
-	Archs                   []android.ArchType
-	DexPreoptImagesDeps     []android.OutputPaths
-	DexPreoptImageLocations []string
+	Archs                         []android.ArchType
+	DexPreoptImagesDeps           []android.OutputPaths
+	DexPreoptImageLocationsOnHost []string // boot image location on host (file path without the arch subdirectory)
 
 	PreoptBootClassPathDexFiles     android.Paths // file paths of boot class path files
 	PreoptBootClassPathDexLocations []string      // virtual locations of boot class path files