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

Commit d798f5c8 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: Icc9c1eda9b93e1ec897425b98cb8f16f83431409
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d37796d 4c3e2df1

android/Android.bp

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

        "singleton_module.go",

        "soong_config_modules.go",

        "source_file_provider.go",

        "test_asserts.go",

        "test_suites.go",

        "testing.go",

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 {

android/source_file_provider.go

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
package android



import (

	"github.com/google/blueprint"

)



type SrcsFileProviderData struct {

	SrcPaths Paths

}



var SrcsFileProviderKey = blueprint.NewProvider(SrcsFileProviderData{})

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)