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

Commit 3f6efacf authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Create a make variable for all lsdump files. am: dcd33b6c 

am: eccf4774

Change-Id: I656f89e51ba05322e0f5603e500cc41e3cb6e75e
parents 4486c87c eccf4774

cc/builder.go

+3 −0
Original line number Diff line number Diff line
@@ -687,6 +687,9 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, 
func TransformDumpToLinkedDump(ctx android.ModuleContext, sAbiDumps android.Paths, soFile android.Path,

	baseName, exportedHeaderFlags string) android.OptionalPath {

	outputFile := android.PathForModuleOut(ctx, baseName+".lsdump")

	sabiLock.Lock()

	lsdumpPaths = append(lsdumpPaths, outputFile.String())

	sabiLock.Unlock()

	symbolFilterStr := "-so " + soFile.String()

	ctx.Build(pctx, android.BuildParams{

		Rule:        sAbiLink,

cc/makevars.go

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("LLNDK_LIBRARIES", strings.Join(llndkLibraries, " "))

	ctx.Strict("VNDK_PRIVATE_LIBRARIES", strings.Join(vndkPrivateLibraries, " "))



	sort.Strings(lsdumpPaths)

	ctx.Strict("LSDUMP_PATHS", strings.Join(lsdumpPaths, " "))



	ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects())

	ctx.Strict("SOONG_MODULES_ADDED_WALL", makeStringOfKeys(ctx, modulesAddedWall))

	ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeStringOfKeys(ctx, modulesUsingWnoError))

cc/sabi.go

+6 −0
Original line number Diff line number Diff line
@@ -16,11 +16,17 @@ package cc 


import (

	"strings"

	"sync"



	"android/soong/android"

	"android/soong/cc/config"

)



var (

	lsdumpPaths []string

	sabiLock    sync.Mutex

)



type SAbiProperties struct {

	CreateSAbiDumps        bool `blueprint:"mutated"`

	ReexportedIncludeFlags []string