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

Use prebuilt m4 instead of system m4

Browse Source 
Bug: 117561006
Test: treehugger
Change-Id: I588d867d95cc52963ce764018a9c09b26973c8c3
This commit is contained in:
Dan Willemsen
2019-06-19 10:54:50 -07:00
parent fedc47141e
commit c69d715d72
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/gen.go
View File

@@ -25,6 +25,7 @@ import (
func init() { func init() {
pctx.SourcePathVariable("lexCmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/flex") pctx.SourcePathVariable("lexCmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/flex")
pctx.SourcePathVariable("m4Cmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/m4")
pctx.HostBinToolVariable("aidlCmd", "aidl-cpp") pctx.HostBinToolVariable("aidlCmd", "aidl-cpp")
pctx.HostBinToolVariable("syspropCmd", "sysprop_cpp") pctx.HostBinToolVariable("syspropCmd", "sysprop_cpp")
@@ -33,8 +34,8 @@ func init() {
var ( var (
lex = pctx.AndroidStaticRule("lex", lex = pctx.AndroidStaticRule("lex",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$lexCmd -o$out $in", Command: "M4=$m4Cmd $lexCmd -o$out $in",
CommandDeps: []string{"$lexCmd"}, CommandDeps: []string{"$lexCmd", "$m4Cmd"},
}) })
sysprop = pctx.AndroidStaticRule("sysprop", sysprop = pctx.AndroidStaticRule("sysprop",

2
cc/makevars.go
View File

@@ -161,6 +161,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("AIDL_CPP", "${aidlCmd}") ctx.Strict("AIDL_CPP", "${aidlCmd}")
ctx.Strict("M4", "${m4Cmd}")
ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}") ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}")
ctx.Strict("SOONG_STRIP_PATH", "${stripPath}") ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")

2
ui/build/paths/config.go
View File

@@ -94,7 +94,7 @@ var Configuration = map[string]PathConfig{
"java": Allowed, "java": Allowed,
"javap": Allowed, "javap": Allowed,
"lsof": Allowed, "lsof": Allowed,
"m4": Allowed, "m4": Log,
"openssl": Allowed, "openssl": Allowed,
"patch": Allowed, "patch": Allowed,
"pstree": Allowed, "pstree": Allowed,