diff options
| author | 2025-02-24 10:30:42 +0900 | |
|---|---|---|
| committer | 2025-02-24 11:10:01 +0900 | |
| commit | a3904c8013221abdc48d1675ea7be3b42b6a7647 (patch) | |
| tree | 818bd17f8c58680a16b9fc3c428577520494e43c | |
| parent | 667a80ca40e6affd41bd2a1fb02c0c6ce2ca1375 (diff) | |
Package Dexpreopt files
Dexpreopt files started to be missed from Soong defined system images.
Package those files so they can be added into the system image in the
same way with KATI system image.
Bug: 370352548
Test: Soong defined system image build succeeded
Change-Id: I1b665b9a891d89d3f042c0ad8a4ffca6cd567b2e
| -rw-r--r-- | apex/builder.go | 1 | ||||
| -rw-r--r-- | apex/prebuilt.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apex/builder.go b/apex/builder.go index 842771920..e8a4078cf 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -592,6 +592,7 @@ func (a *apexBundle) installApexSystemServerFiles(ctx android.ModuleContext) { } a.extraInstalledFiles = append(a.extraInstalledFiles, installedFile) a.extraInstalledPairs = append(a.extraInstalledPairs, installPair{install.OutputPathOnHost, installedFile}) + ctx.PackageFile(install.InstallDirOnDevice, install.InstallFileOnDevice, install.OutputPathOnHost) } if performInstalls { for _, dexJar := range fi.systemServerDexJars { diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 3daa4f81a..0a970276a 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -245,6 +245,7 @@ func (p *prebuiltCommon) installApexSystemServerFiles(ctx android.ModuleContext) } p.extraInstalledFiles = append(p.extraInstalledFiles, installedFile) p.extraInstalledPairs = append(p.extraInstalledPairs, installPair{install.OutputPathOnHost, installedFile}) + ctx.PackageFile(install.InstallDirOnDevice, install.InstallFileOnDevice, install.OutputPathOnHost) } for _, dexJar := range p.systemServerDexJars { |