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

Call PackageFile for dexpreopt files

Browse Source 
Dexpreopt files use RuleBuilder.Install() that installs the file from
Make. By calling PackageFile, this information is also shared to
soong PackagingSpec.

Bug: 339314890
Test: See if .prof, .bprof, and vdex files are installed with
      "m aosp_cf_system_x86_64"

Change-Id: I42167603ecfd4334e4f35602bdf03a21846fc798
This commit is contained in:
Justin Yun
2024-06-05 20:25:03 +09:00
parent 6918e6084c
commit 22c8aca893
3 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
java/dexpreopt.go
View File

@@ -541,12 +541,21 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, libName string, dexJa
// Use the path of the dex file to determine the library name
isApexSystemServerJar := global.AllApexSystemServerJars(ctx).ContainsJar(dexJarStem)
partition := d.installPath.Partition()
for _, install := range dexpreoptRule.Installs() {
// Remove the "/" prefix because the path should be relative to $ANDROID_PRODUCT_OUT.
installDir := strings.TrimPrefix(filepath.Dir(install.To), "/")
if strings.HasPrefix(installDir, partition+"/") {
installDir = strings.TrimPrefix(installDir, partition+"/")
} else {
// If the partition for the installDir is different from the install partition, set the
// partition empty to install the dexpreopt files to the desired partition.
// TODO(b/346439786): Define and use the dexpreopt module type to avoid this mismatch.
partition = ""
}
installBase := filepath.Base(install.To)
arch := filepath.Base(installDir)
installPath := android.PathForModuleInPartitionInstall(ctx, "", installDir)
installPath := android.PathForModuleInPartitionInstall(ctx, partition, installDir)
isProfile := strings.HasSuffix(installBase, ".prof")
if isProfile {
@@ -580,6 +589,37 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, libName string, dexJa
}
}
func getModuleInstallPathInfo(ctx android.ModuleContext, fullInstallPath string) (android.InstallPath, string, string) {
installPath := android.PathForModuleInstall(ctx)
installDir, installBase := filepath.Split(strings.TrimPrefix(fullInstallPath, "/"))
if !strings.HasPrefix(installDir, installPath.Partition()+"/") {
// Return empty filename if the install partition is not for the target image.
return installPath, "", ""
}
relDir, err := filepath.Rel(installPath.Partition(), installDir)
if err != nil {
panic(err)
}
return installPath, relDir, installBase
}
// RuleBuilder.Install() adds output-to-install copy pairs to a list for Make. To share this
// information with PackagingSpec in soong, call PackageFile for them.
// The install path and the target install partition of the module must be the same.
func packageFile(ctx android.ModuleContext, install android.RuleBuilderInstall) {
installPath, relDir, name := getModuleInstallPathInfo(ctx, install.To)
// Empty name means the install partition is not for the target image.
// For the system image, files for "apex" and "system_other" are skipped here.
// The skipped "apex" files are for testing only, for example,
// "/apex/art_boot_images/javalib/x86/boot.vdex".
// TODO(b/320196894): Files for "system_other" are skipped because soong creates the system
// image only for now.
if name != "" {
ctx.PackageFile(installPath.Join(ctx, relDir), name, install.From)
}
}
func (d *dexpreopter) DexpreoptBuiltInstalledForApex() []dexpreopterInstall {
return d.builtInstalledForApex
}