Merge "Qualify prebuilt_etc apex module name by relative paths" into main
diff --git a/apex/apex.go b/apex/apex.go
index 9a80ec6..99a0da8 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, outputFile.Base(), dirInApex, etc, prebuilt)
+ return newApexFile(ctx, outputFile, strings.ReplaceAll(outputFile.Rel(), "/", "_"), dirInApex, etc, prebuilt)
}
func apexFileForCompatConfig(ctx android.BaseModuleContext, config java.PlatformCompatConfigIntf, depName string) apexFile {