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

Commit 95e2a3cb authored by Aditya Choudhary's avatar Aditya Choudhary
Browse files

Add source file provider for genrule/srcs, python libraries and rust libraries. 

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of:aosp/2786121

Change-Id: I2d7d4684a10c15aeecc27b8db800ab27a807d2e2
Merged-In: I2d7d4684a10c15aeecc27b8db800ab27a807d2e2
parent 40c8da1d

android/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,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
@@ -237,6 +237,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
@@ -208,6 +208,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
@@ -2109,6 +2109,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()})



	c.maybeInstall(ctx, apexInfo)

}