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

Commit 704c12d0 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen
Browse files

Find LLNDK dumps in prebuilts/abi-dumps/vndk 

LLNDK will not be finalized at the same time as APEX and NDK. The
dumps have to be placed in a different directory. The new LLNDK dumps
will be created in "vndk" directory.

Test: lunch aosp_x86_64-next-eng ; make
Bug: 314010764
Change-Id: I0726e3eabcfdbfb94a10f01ddd6dfb971552bd50
parent 1e33a311

cc/library.go

+4 −2
Original line number Diff line number Diff line
@@ -1350,10 +1350,12 @@ func getRefAbiDumpFile(ctx android.ModuleInstallPathContext, 
		fileName+".lsdump")

}



func getRefAbiDumpDir(isNdk bool) string {

func getRefAbiDumpDir(isNdk, isLlndk bool) string {

	var dirName string

	if isNdk {

		dirName = "ndk"

	} else if isLlndk {

		dirName = "vndk"

	} else {

		dirName = "platform"

	}
@@ -1476,7 +1478,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec 


		addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String())



		dumpDir := getRefAbiDumpDir(isNdk)

		dumpDir := getRefAbiDumpDir(isNdk, isLlndk)

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

		// Check against the previous version.

		prevVersionInt := prevRefAbiDumpVersion(ctx, dumpDir)