Merge "Revert "Qualify prebuilt_etc apex module name by relative paths"" into main am: 3ef813bdf2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3089006
Change-Id: I71d05e8a243bd75e261e59732b82cfb1bbe19437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/apex/apex.go b/apex/apex.go
index 99a0da8..9a80ec6 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1636,7 +1636,7 @@
func apexFileForPrebuiltEtc(ctx android.BaseModuleContext, prebuilt prebuilt_etc.PrebuiltEtcModule, outputFile android.Path) apexFile {
dirInApex := filepath.Join(prebuilt.BaseDir(), prebuilt.SubDir())
- return newApexFile(ctx, outputFile, strings.ReplaceAll(outputFile.Rel(), "/", "_"), dirInApex, etc, prebuilt)
+ return newApexFile(ctx, outputFile, outputFile.Base(), dirInApex, etc, prebuilt)
}
func apexFileForCompatConfig(ctx android.BaseModuleContext, config java.PlatformCompatConfigIntf, depName string) apexFile {