commit d2e291ae5c62e8dccde954cdbd162deb05610ec6
author Dan Willemsen <dwillemsen@google.com> Thu Jul 16 17:49:05 2020 -0700
committer Dan Willemsen <dwillemsen@google.com> Fri Jul 17 20:07:16 2020 -0700
tree e490bcfc7fcc4605f95a1d95073306b6bd918dfc
parent 13af8140bcf40c71deb3b0fee11bb8e9ad792621

Switch cc's use of bison and flex to prebuilt_build_tool

Test: treehugger
Change-Id: I6150f0f39151e8073d5d59fe189f614140fed57b

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index d5ea2c3..ba14dd5 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -251,6 +251,14 @@
 		deps.StaticLibs = append(deps.StaticLibs, "libomp")
 	}
 
+	if compiler.hasSrcExt(".y") || compiler.hasSrcExt(".yy") {
+		deps.Tools = append(deps.Tools, "bison", "m4")
+	}
+
+	if compiler.hasSrcExt(".l") || compiler.hasSrcExt(".ll") {
+		deps.Tools = append(deps.Tools, "flex", "m4")
+	}
+
 	return deps
 }
 
@@ -581,7 +589,7 @@
 
 	srcs := append(android.Paths(nil), compiler.srcsBeforeGen...)
 
-	srcs, genDeps := genSources(ctx, srcs, buildFlags)
+	srcs, genDeps := genSources(ctx, srcs, buildFlags, deps.Tools)
 	pathDeps = append(pathDeps, genDeps...)
 
 	compiler.pathDeps = pathDeps