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

Commit ab279a05 authored by Aditya Choudhary's avatar Aditya Choudhary Committed by Automerger Merge Worker
Browse files

Merge changes from topic "code_metadata" into main am: 4c3e2df1 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607



Change-Id: Idbe1050f36ce3bc7e22bc8210dcabd045d20d7db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82355e90 4c3e2df1

android/filegroup.go

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx ModuleContext) { 
	if fg.properties.Path != nil {

		fg.srcs = PathsWithModuleSrcSubDir(ctx, fg.srcs, String(fg.properties.Path))

	}

	ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: fg.srcs.Strings()})

}



func (fg *fileGroup) Srcs() Paths {

bpf/bpf.go

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		}



	}

	ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()})

}



func (bpf *bpf) AndroidMk() android.AndroidMkData {

cc/cc.go

+1 −0
Original line number Diff line number Diff line
@@ -2322,6 +2322,7 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { 
	if c.testModule {

		ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})

	}

	ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()})



	aconfig.CollectTransitiveAconfigFiles(ctx, &c.transitiveAconfigFiles)

genrule/genrule.go

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) { 
		return srcFiles

	}

	srcFiles := addLabelsForInputs("srcs", g.properties.Srcs, g.properties.Exclude_srcs)

	ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcFiles.Strings()})



	var copyFrom android.Paths

	var outputFiles android.WritablePaths

java/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ bootstrap_go_package { 
        "app_import_test.go",

        "app_set_test.go",

        "app_test.go",

        "code_metadata_test.go",

        "bootclasspath_fragment_test.go",

        "device_host_converter_test.go",

        "dex_test.go",