commit 3c3e59b2a2644f866cea47371e9c92037fb08f6d
author Dan Willemsen <dwillemsen@google.com> Wed Jun 19 10:52:50 2019 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Jun 19 10:59:57 2019 -0700
tree ac1ce66d745671b9e2d5d3effd40f161be79886e
parent a999e394230e3b93b5b4af0908e87c0704ba2aca

Use prebuilt m4 instead of system m4

Bug: 117561006
Test: treehugger
Change-Id: Id794aed10fdffef10490561d2cfeb2a92801b331

build/soong/selinux_contexts.go

diff --git a/build/soong/selinux_contexts.go b/build/soong/selinux_contexts.go
index 632237c..020357a 100644
--- a/build/soong/selinux_contexts.go
+++ b/build/soong/selinux_contexts.go
@@ -263,7 +263,8 @@
 	rule := android.NewRuleBuilder()
 
 	rule.Command().
-		Text("m4 --fatal-warnings -s").
+		Tool(ctx.Config().PrebuiltBuildTool(ctx, "m4")).
+		Text("--fatal-warnings -s").
 		FlagForEachArg("-D", ctx.DeviceConfig().SepolicyM4Defs()).
 		Inputs(inputs).
 		FlagWithOutput("> ", m.outputPath)