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

Commit f5ed30b2 authored by Mu-Le Lee's avatar Mu-Le Lee
Browse files

Move function PathForVndkRefAbiDump to Prevent unnecessary exports in paths.go 

This CL moves function PathForVndkRefAbiDump from android/paths.go to
cc/library.go to prevent unnecessary exports.

Test: make libz
Bug: 239915696
Change-Id: I1270e8d07edb09d93621c049acab9196757d356b
parent 1304393b

android/paths.go

+0 −35
Original line number Diff line number Diff line
@@ -1474,41 +1474,6 @@ func pathForModuleOut(ctx ModuleOutPathContext) OutputPath { 
	return PathForOutput(ctx, ".intermediates", ctx.ModuleDir(), ctx.ModuleName(), ctx.ModuleSubDir())

}



// PathForVndkRefAbiDump returns an OptionalPath representing the path of the

// reference abi dump for the given module. This is not guaranteed to be valid.

func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string,

	isNdk, isVndk, isGzip bool) OptionalPath {



	currentArchType := ctx.Arch().ArchType

	primaryArchType := ctx.Config().DevicePrimaryArchType()

	archName := currentArchType.String()

	if currentArchType != primaryArchType {

		archName += "_" + primaryArchType.String()

	}



	var dirName string

	if isNdk {

		dirName = "ndk"

	} else if isVndk {

		dirName = "vndk"

	} else {

		dirName = "platform" // opt-in libs

	}



	binderBitness := ctx.DeviceConfig().BinderBitness()



	var ext string

	if isGzip {

		ext = ".lsdump.gz"

	} else {

		ext = ".lsdump"

	}



	return ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName,

		version, binderBitness, archName, "source-based",

		fileName+ext)

}



// PathForModuleOut returns a Path representing the paths... under the module's

// output directory.

func PathForModuleOut(ctx ModuleOutPathContext, paths ...string) ModuleOutPath {

cc/library.go

+37 −2
Original line number Diff line number Diff line
@@ -1600,13 +1600,48 @@ func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath { 
	return library.coverageOutputFile

}



// pathForVndkRefAbiDump returns an OptionalPath representing the path of the

// reference abi dump for the given module. This is not guaranteed to be valid.

func pathForVndkRefAbiDump(ctx android.ModuleInstallPathContext, version, fileName string,

	isNdk, isVndk, isGzip bool) android.OptionalPath {



	currentArchType := ctx.Arch().ArchType

	primaryArchType := ctx.Config().DevicePrimaryArchType()

	archName := currentArchType.String()

	if currentArchType != primaryArchType {

		archName += "_" + primaryArchType.String()

	}



	var dirName string

	if isNdk {

		dirName = "ndk"

	} else if isVndk {

		dirName = "vndk"

	} else {

		dirName = "platform" // opt-in libs

	}



	binderBitness := ctx.DeviceConfig().BinderBitness()



	var ext string

	if isGzip {

		ext = ".lsdump.gz"

	} else {

		ext = ".lsdump"

	}



	return android.ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName,

		version, binderBitness, archName, "source-based",

		fileName+ext)

}



func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {

	// The logic must be consistent with classifySourceAbiDump.

	isNdk := ctx.isNdk(ctx.Config())

	isVndk := ctx.useVndk() && ctx.isVndk()



	refAbiDumpTextFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, false)

	refAbiDumpGzipFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, true)

	refAbiDumpTextFile := pathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, false)

	refAbiDumpGzipFile := pathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isVndk, true)



	if refAbiDumpTextFile.Valid() {

		if refAbiDumpGzipFile.Valid() {