StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop IncludeTags

Browse Source 
This was previously used in conjunction with blueprint_package_includes
to prune Android.bp files from soong analysis.

Test: m nothing
Bug: 308188212
Change-Id: Ie82e20eec63bd0be70e1cf0290c70f62d5621c76
This commit is contained in:
Spandan Das
2024-05-22 19:11:09 +00:00
parent b07e7fd542
commit aa9369b71d
7 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1329,10 +1329,6 @@ func (c *config) SourceRootDirs() []string {
return c.productVariables.SourceRootDirs return c.productVariables.SourceRootDirs
} }
func (c *config) IncludeTags() []string {
return c.productVariables.IncludeTags
}
func (c *config) HostStaticBinaries() bool { func (c *config) HostStaticBinaries() bool {
return Bool(c.productVariables.HostStaticBinaries) return Bool(c.productVariables.HostStaticBinaries)
} }

1
android/register.go
View File

@@ -156,7 +156,6 @@ type Context struct {
func NewContext(config Config) *Context { func NewContext(config Config) *Context {
ctx := &Context{blueprint.NewContext(), config} ctx := &Context{blueprint.NewContext(), config}
ctx.SetSrcDir(absSrcDir) ctx.SetSrcDir(absSrcDir)
ctx.AddIncludeTags(config.IncludeTags()...)
ctx.AddSourceRootDirs(config.SourceRootDirs()...) ctx.AddSourceRootDirs(config.SourceRootDirs()...)
return ctx return ctx
} }

1
android/variable.go
View File

@@ -471,7 +471,6 @@ type ProductVariables struct {
IgnorePrefer32OnDevice bool `json:",omitempty"` IgnorePrefer32OnDevice bool `json:",omitempty"`
IncludeTags []string `json:",omitempty"`
SourceRootDirs []string `json:",omitempty"` SourceRootDirs []string `json:",omitempty"`
AfdoProfiles []string `json:",omitempty"` AfdoProfiles []string `json:",omitempty"`

1
cmd/soong_build/main.go
View File

@@ -98,7 +98,6 @@ func newContext(configuration android.Config) *android.Context {
ctx := android.NewContext(configuration) ctx := android.NewContext(configuration)
ctx.SetNameInterface(newNameResolver(configuration)) ctx.SetNameInterface(newNameResolver(configuration))
ctx.SetAllowMissingDependencies(configuration.AllowMissingDependencies()) ctx.SetAllowMissingDependencies(configuration.AllowMissingDependencies())
ctx.AddIncludeTags(configuration.IncludeTags()...)
ctx.AddSourceRootDirs(configuration.SourceRootDirs()...) ctx.AddSourceRootDirs(configuration.SourceRootDirs()...)
return ctx return ctx
} }

8
ui/build/config.go
View File

@@ -1164,14 +1164,6 @@ func (c *configImpl) SetSourceRootDirs(i []string) {
c.sourceRootDirs = i c.sourceRootDirs = i
} }
func (c *configImpl) GetIncludeTags() []string {
return c.includeTags
}
func (c *configImpl) SetIncludeTags(i []string) {
c.includeTags = i
}
func (c *configImpl) GetLogsPrefix() string { func (c *configImpl) GetLogsPrefix() string {
return c.logsPrefix return c.logsPrefix
} }

1
ui/build/dumpvars.go
View File

@@ -301,6 +301,5 @@ func runMakeProductConfig(ctx Context, config Config) {
config.SetBuildBrokenDupRules(makeVars["BUILD_BROKEN_DUP_RULES"] == "true") config.SetBuildBrokenDupRules(makeVars["BUILD_BROKEN_DUP_RULES"] == "true")
config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true") config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true")
config.SetBuildBrokenNinjaUsesEnvVars(strings.Fields(makeVars["BUILD_BROKEN_NINJA_USES_ENV_VARS"])) config.SetBuildBrokenNinjaUsesEnvVars(strings.Fields(makeVars["BUILD_BROKEN_NINJA_USES_ENV_VARS"]))
config.SetIncludeTags(strings.Fields(makeVars["PRODUCT_INCLUDE_TAGS"]))
config.SetSourceRootDirs(strings.Fields(makeVars["PRODUCT_SOURCE_ROOT_DIRS"])) config.SetSourceRootDirs(strings.Fields(makeVars["PRODUCT_SOURCE_ROOT_DIRS"]))
} }

1
ui/build/soong.go
View File

@@ -401,7 +401,6 @@ func bootstrapBlueprint(ctx Context, config Config) {
} }
blueprintCtx := blueprint.NewContext() blueprintCtx := blueprint.NewContext()
blueprintCtx.AddIncludeTags(config.GetIncludeTags()...)
blueprintCtx.AddSourceRootDirs(config.GetSourceRootDirs()...) blueprintCtx.AddSourceRootDirs(config.GetSourceRootDirs()...)
blueprintCtx.SetIgnoreUnknownModuleTypes(true) blueprintCtx.SetIgnoreUnknownModuleTypes(true)
blueprintConfig := BlueprintConfig{ blueprintConfig := BlueprintConfig{