From 978f453c43348d43a0930ff6cf09cc6e145bd759 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 5 Dec 2024 21:05:43 +0000 Subject: Remove Base_dir from non system non recovery filesystem vendor.img/product.img... built by make do not assemble the artifacts in a $partition subdirectory. This CL adds this to soong built img files, and updates the symmlinks. Test: soong_generated_system_filesystem_test m soong_generated_vendor_filesystem_test soong_generated_product_filesystem_test Change-Id: Ia5feaf85bb49d552b93698c50998d8df7575e44a --- filesystem/filesystem.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 84384a5ac..b9cb0769a 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, "root", f.partitionName()).String() + "/" + partitionBaseDir := android.PathForModuleOut(ctx, "root", proptools.String(f.properties.Base_dir)).String() + "/" relPath, inTargetPartition := strings.CutPrefix(installedFile.String(), partitionBaseDir) if inTargetPartition { -- cgit v1.2.3-59-g8ed1b