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

Revert "Switch cc's use of bison and flex to prebuilt_build_tool"

Browse Source 
Revert submission 1366377-prebuilt_build_tool_make

Reason for revert: breaks build
Reverted Changes:
I20bf062bb:Export prebuilt tools to Make
I4bb526492:Move some prebuilt build tool configs to Soong
I195b68813:Support per-module MakeVars
Ibcb257e7b:Fix dependency loop with flex
I6150f0f39:Switch cc's use of bison and flex to prebuilt_buil...
I6939451b8:Reland "Use genrules to build a consistent awk."
Idee60640f:Add prebuilt_build_tool modules for genrule use
I00893172b:Rename bison to bison_bin
I82c26be1c:Add prebuilt_build_tool to allow genrules to use p...

Change-Id: I1ca553ffe4b09250a441b9bc477c3ba98c6f6549
This commit is contained in:
David Su
2020-07-24 17:19:23 +00:00
committed by Colin Cross
parent fae4d517fc
commit dd18efd95d
3 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cc/cc.go
View File

@@ -116,8 +116,6 @@ type Deps struct {
// Used for host bionic
LinkerFlagsFile string
DynamicLinker string
Tools []string
}
type PathDeps struct {
@@ -160,8 +158,6 @@ type PathDeps struct {
// Path to the dynamic linker binary
DynamicLinker android.OptionalPath
Tools map[string]android.Path
}
// LocalOrGlobalFlags contains flags that need to have values set globally by the build system or locally by the module
@@ -429,12 +425,6 @@ type xref interface {
XrefCcFiles() android.Paths
}
type ToolDependencyTag struct {
blueprint.BaseDependencyTag
Name string
}
var (
dataLibDepTag = DependencyTag{Name: "data_lib", Library: true, Shared: true}
sharedExportDepTag = DependencyTag{Name: "shared", Library: true, Shared: true, ReexportFlags: true}
@@ -1704,7 +1694,6 @@ func (c *Module) deps(ctx DepsContext) Deps {
deps.LateSharedLibs = android.LastUniqueStrings(deps.LateSharedLibs)
deps.HeaderLibs = android.LastUniqueStrings(deps.HeaderLibs)
deps.RuntimeLibs = android.LastUniqueStrings(deps.RuntimeLibs)
deps.Tools = android.LastUniqueStrings(deps.Tools)
for _, lib := range deps.ReexportSharedLibHeaders {
if !inList(lib, deps.SharedLibs) {
@@ -2048,11 +2037,6 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
}, vndkExtDepTag, vndkdep.getVndkExtendsModuleName())
}
}
for _, tool := range deps.Tools {
actx.AddFarVariationDependencies(ctx.Config().BuildOSTarget.Variations(),
ToolDependencyTag{Name: tool}, tool)
}
}
func BeginMutator(ctx android.BottomUpMutatorContext) {
@@ -2235,21 +2219,6 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
depName := ctx.OtherModuleName(dep)
depTag := ctx.OtherModuleDependencyTag(dep)
if toolDep, ok := depTag.(ToolDependencyTag); ok {
if toolMod, ok := dep.(android.HostToolProvider); ok {
if depPaths.Tools == nil {
depPaths.Tools = make(map[string]android.Path)
}
toolPath := toolMod.HostToolPath()
if !toolPath.Valid() {
ctx.ModuleErrorf("Failed to find path for host tool %q", toolDep.Name)
}
depPaths.Tools[toolDep.Name] = toolPath.Path()
} else {
ctx.ModuleErrorf("Found module, but not host tool for %q", toolDep.Name)
}
}
ccDep, ok := dep.(LinkableInterface)
if !ok {