commit f6307877d35b863ddfac1210494eedf25b136d75
author Eric Salo <salo@google.com> Sat Nov 05 16:16:27 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Nov 05 16:17:03 2022 -0700
tree a5e21eeb32061278031230f7769a3edec83f104d
parent 46699b72ad6aeac0322bfd81f0a865d62c211c27

move portability stuff into upb/port/

Also delete redundant system #includes that are already pulled in by port/def.inc

PiperOrigin-RevId: 486398989

bazel/amalgamate.py

diff --git a/bazel/amalgamate.py b/bazel/amalgamate.py
index e7121c6..d15ea57 100755
--- a/bazel/amalgamate.py
+++ b/bazel/amalgamate.py
@@ -53,8 +53,8 @@
 
     self.output_h.write("/* Amalgamated source file */\n")
 
-    port_def = self._find_include_file("upb/port_def.inc")
-    port_undef = self._find_include_file("upb/port_undef.inc")
+    port_def = self._find_include_file("upb/port/def.inc")
+    port_undef = self._find_include_file("upb/port/undef.inc")
     self._process_file(port_def, self.output_h)
     self._process_file(port_def, self.output_c)
 
@@ -88,7 +88,7 @@
       return False
     if not (include.startswith("upb") or include.startswith("google")):
       return False
-    if include and (include.endswith("port_def.inc") or include.endswith("port_undef.inc")):
+    if include and (include.endswith("port/def.inc") or include.endswith("port/undef.inc")):
       # Skip, we handle this separately
       return True
     if include.endswith("hpp"):