Ported BUILD file fixes for google3 to arrayapi branch.

2 files changed, 9 insertions, 3 deletions

diff --git a/tools/amalgamate.py b/tools/amalgamate.py
index 4739a94..038c83f 100755
--- a/tools/amalgamate.py
+++ b/tools/amalgamate.py
@@ -16,11 +16,11 @@ class Amalgamator:
     self.output_h = open(output_path + "upb.h", "w")
     self.output_c = open(output_path + "upb.c", "w")
 
-    self.output_c.write("// Amalgamated source file\n")
+    self.output_c.write("/* Amalgamated source file */\n")
     self.output_c.write('#include "upb.h"\n')
     self.output_c.write(open("upb/port_def.inc").read())
 
-    self.output_h.write("// Amalgamated source file\n")
+    self.output_h.write("/* Amalgamated source file */\n")
     self.output_h.write(open("upb/port_def.inc").read())
 
   def finish(self):
diff --git a/tools/make_cmakelists.py b/tools/make_cmakelists.py
index b8f46b9..d863e7e 100755
--- a/tools/make_cmakelists.py
+++ b/tools/make_cmakelists.py
@@ -123,9 +123,15 @@ class BuildFileFunctions(object):
   def genrule(self, **kwargs):
     pass
 
-  def glob(*args):
+  def glob(self, *args):
     return []
 
+  def map_dep(self, dep):
+    return dep
+
+  def licenses(self, *args):
+    pass
+
 
 class WorkspaceFileFunctions(object):
   def __init__(self, converter):