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

Commit 6f84b776 authored by Mu-Le Lee's avatar Mu-Le Lee Committed by Gerrit Code Review
Browse files

Merge "Move LLNDK ABI dumps from vndk/ to platform/"

parents b59a3dba 85155c8a

android/paths.go

+2 −2
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ func pathForModuleOut(ctx ModuleOutPathContext) OutputPath { 
// 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, isLlndkOrVndk, isGzip bool) OptionalPath {

	isNdk, isVndk, isGzip bool) OptionalPath {



	currentArchType := ctx.Arch().ArchType

	primaryArchType := ctx.Config().DevicePrimaryArchType()
@@ -1486,7 +1486,7 @@ func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName strin 
	var dirName string

	if isNdk {

		dirName = "ndk"

	} else if isLlndkOrVndk {

	} else if isVndk {

		dirName = "vndk"

	} else {

		dirName = "platform" // opt-in libs

cc/library.go

+3 −3
Original line number Diff line number Diff line
@@ -1594,10 +1594,10 @@ func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath { 
func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {

	// The logic must be consistent with classifySourceAbiDump.

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

	isLlndkOrVndk := ctx.IsLlndkPublic() || (ctx.useVndk() && ctx.isVndk())

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



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

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

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

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



	if refAbiDumpTextFile.Valid() {

		if refAbiDumpGzipFile.Valid() {