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

Commit c69d715d authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Use prebuilt m4 instead of system m4 

Bug: 117561006
Test: treehugger
Change-Id: I588d867d95cc52963ce764018a9c09b26973c8c3
parent fedc4714

cc/gen.go

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import ( 


func init() {

	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("syspropCmd", "sysprop_cpp")
@@ -33,8 +34,8 @@ func init() { 
var (

	lex = pctx.AndroidStaticRule("lex",

		blueprint.RuleParams{

			Command:     "$lexCmd -o$out $in",

			CommandDeps: []string{"$lexCmd"},

			Command:     "M4=$m4Cmd $lexCmd -o$out $in",

			CommandDeps: []string{"$lexCmd", "$m4Cmd"},

		})



	sysprop = pctx.AndroidStaticRule("sysprop",

cc/makevars.go

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 


	ctx.Strict("AIDL_CPP", "${aidlCmd}")



	ctx.Strict("M4", "${m4Cmd}")



	ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}")



	ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")

ui/build/paths/config.go

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ var Configuration = map[string]PathConfig{ 
	"java":     Allowed,

	"javap":    Allowed,

	"lsof":     Allowed,

	"m4":       Allowed,

	"m4":       Log,

	"openssl":  Allowed,

	"patch":    Allowed,

	"pstree":   Allowed,