diff options
| author | 2024-12-10 23:30:13 +0000 | |
|---|---|---|
| committer | 2024-12-10 23:30:13 +0000 | |
| commit | 8166813576222084d266c8900e9395b071af0e04 (patch) | |
| tree | 6ed3e292ab188b2da2aac026641afdf85dd002c7 /filesystem/filesystem.go | |
| parent | e444cbc815f96559fb0918f9b54f5f40953a2cf2 (diff) | |
| parent | 135904463f96f81bd7ef7696569b02ebb61c8195 (diff) | |
Merge "Revert "Use partition intead of "root" to assemble filesystem artifacts"" into main
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 9ad2cc9bc..cd3808c56 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -457,7 +457,7 @@ func (f *filesystem) validateVintfFragments(ctx android.ModuleContext) { } func (f *filesystem) appendToEntry(ctx android.ModuleContext, installedFile android.Path) { - partitionBaseDir := android.PathForModuleOut(ctx, f.rootDirString(), proptools.String(f.properties.Base_dir)).String() + "/" + partitionBaseDir := android.PathForModuleOut(ctx, "root", proptools.String(f.properties.Base_dir)).String() + "/" relPath, inTargetPartition := strings.CutPrefix(installedFile.String(), partitionBaseDir) if inTargetPartition { @@ -547,12 +547,8 @@ func (f *filesystem) copyFilesToProductOut(ctx android.ModuleContext, builder *a builder.Command().Textf("cp -prf %s/* %s", rebasedDir, installPath) } -func (f *filesystem) rootDirString() string { - return f.partitionName() -} - func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) android.Path { - rootDir := android.PathForModuleOut(ctx, f.rootDirString()).OutputPath + rootDir := android.PathForModuleOut(ctx, "root").OutputPath rebasedDir := rootDir if f.properties.Base_dir != nil { rebasedDir = rootDir.Join(ctx, *f.properties.Base_dir) @@ -779,7 +775,7 @@ func (f *filesystem) buildCpioImage(ctx android.ModuleContext, compressed bool) ctx.PropertyErrorf("include_make_built_files", "include_make_built_files is not supported for compressed cpio image.") } - rootDir := android.PathForModuleOut(ctx, f.rootDirString()).OutputPath + rootDir := android.PathForModuleOut(ctx, "root").OutputPath rebasedDir := rootDir if f.properties.Base_dir != nil { rebasedDir = rootDir.Join(ctx, *f.properties.Base_dir) |