Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ef813bd authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Revert "Qualify prebuilt_etc apex module name by relative paths"" into main

parents a910dce1 c005ba0f

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ func apexFileForShBinary(ctx android.BaseModuleContext, sh *sh.ShBinary) apexFil 


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 {