StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add usesTargetFiles option in dexpreopt_gen

Browse Source 
For running dex2oat on the target_files, the paths should be use the
device install path instead of the path starting with $(OUT).
So add usesTargetFiles option and basePath option which indicates
extracted path. With those options, the path is replaced with
$(basePath)/$(device path)

And also, add DexPreoptImageDeviceLocations in the config which refers
to the boot image path(without arch) on the device. Because
DexPreoptImage related device path was missing.

Bug: 158843648
Test: dexpreopt_gen -usesTargetFiles -basePath (extract path) and then
check if paths in the generated shell script are based on on-device
path.

Change-Id: I9667fadbf3b7c6f770e0d1bcbee5d67c1ecd8a3d
This commit is contained in:
Jeongik Cha
2021-04-27 23:56:44 +09:00
parent 015a0afe07
commit 4dda75e73e
6 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dexpreopt/config.go
View File

@@ -130,9 +130,11 @@ type ModuleConfig struct {
ProvidesUsesLibrary string // library name (usually the same as module name)
ClassLoaderContexts ClassLoaderContextMap
Archs []android.ArchType
DexPreoptImagesDeps []android.OutputPaths
DexPreoptImageLocationsOnHost []string // boot image location on host (file path without the arch subdirectory)
Archs []android.ArchType
DexPreoptImagesDeps []android.OutputPaths
DexPreoptImageLocationsOnHost []string // boot image location on host (file path without the arch subdirectory)
DexPreoptImageLocationsOnDevice []string // boot image location on device (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