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

Commit 211fdd66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Drop IncludeTags" into main

parents aff9a2c7 aa9369b7

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -1334,10 +1334,6 @@ func (c *config) SourceRootDirs() []string { 
	return c.productVariables.SourceRootDirs

}



func (c *config) IncludeTags() []string {

	return c.productVariables.IncludeTags

}



func (c *config) HostStaticBinaries() bool {

	return Bool(c.productVariables.HostStaticBinaries)

}

android/register.go

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ type Context struct { 
func NewContext(config Config) *Context {

	ctx := &Context{blueprint.NewContext(), config}

	ctx.SetSrcDir(absSrcDir)

	ctx.AddIncludeTags(config.IncludeTags()...)

	ctx.AddSourceRootDirs(config.SourceRootDirs()...)

	return ctx

}

android/variable.go

+0 −1
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ type ProductVariables struct { 


	IgnorePrefer32OnDevice bool `json:",omitempty"`



	IncludeTags    []string `json:",omitempty"`

	SourceRootDirs []string `json:",omitempty"`



	AfdoProfiles []string `json:",omitempty"`

cmd/soong_build/main.go

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ func newContext(configuration android.Config) *android.Context { 
	ctx := android.NewContext(configuration)

	ctx.SetNameInterface(newNameResolver(configuration))

	ctx.SetAllowMissingDependencies(configuration.AllowMissingDependencies())

	ctx.AddIncludeTags(configuration.IncludeTags()...)

	ctx.AddSourceRootDirs(configuration.SourceRootDirs()...)

	return ctx

}

ui/build/config.go

+0 −8
Original line number Diff line number Diff line
@@ -1164,14 +1164,6 @@ func (c *configImpl) SetSourceRootDirs(i []string) { 
	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 {

	return c.logsPrefix

}