commit 613564eed4129660dc5ee58469c580a4276c22b7
author Dan Willemsen <dwillemsen@google.com> Thu Jul 23 21:37:35 2020 +0000
committer Dan Willemsen <dwillemsen@google.com> Thu Jul 23 21:37:35 2020 +0000
tree e490bcfc7fcc4605f95a1d95073306b6bd918dfc
parent 2019658b86efa7c3ff1ad3853e408cafb32c2953

Revert "Support per-module MakeVars"

This reverts commit 2019658b86efa7c3ff1ad3853e408cafb32c2953.

Reason for revert: broke builds where makefiles were using M4 without depending upon it

Change-Id: I18304246e7a8a8f8c2620dd2c65ed77acd256be2

cc/gen.go

diff --git a/cc/gen.go b/cc/gen.go
index edae061..6f9036b 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -24,6 +24,8 @@
 )
 
 func init() {
+	pctx.SourcePathVariable("m4Cmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/m4")
+
 	pctx.HostBinToolVariable("aidlCmd", "aidl-cpp")
 	pctx.HostBinToolVariable("syspropCmd", "sysprop_cpp")
 }