commit 5fad501aeb390010d0d09a88fdcbca5662cc753b
author Liz Kammer <eakammer@google.com> Thu Sep 09 14:08:21 2021 -0400
committer Liz Kammer <eakammer@google.com> Thu Sep 09 15:59:05 2021 -0400
tree bad110a7c30dcfe7e9408921262ffbf875babff6
parent 4011ebb12d1e474ef6aa2c1895ea32f72b03200f

bp2build: Split export_{includes,system_includes}

The specification of exporting includes vs system includes has an impact
on inclusion sort order. Conflating the two caused some symbols to not
be resolved correctly.

Bug: 198403271
Test: build/bazel/ci/bp2build.sh
Test: USE_BAZEL_ANALYSIS=1 m libbacktrace_no_dex succeeds with libc++_*
      modules removed from mixed build denylist (would fail otherwise)
Change-Id: I08aff253d8962dc678ed10214b1c171330e0fe19

bp2build/cc_library_conversion_test.go

diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go
index c840016..086bafe 100644
--- a/bp2build/cc_library_conversion_test.go
+++ b/bp2build/cc_library_conversion_test.go
@@ -122,8 +122,8 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
+    export_includes = ["foo-dir"],
     implementation_deps = [":some-headers"],
-    includes = ["foo-dir"],
     linkopts = ["-Wl,--exclude-libs=bar.a"] + select({
         "//build/bazel/platforms/arch:x86": ["-Wl,--exclude-libs=baz.a"],
         "//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=qux.a"],

bp2build/cc_library_headers_conversion_test.go

diff --git a/bp2build/cc_library_headers_conversion_test.go b/bp2build/cc_library_headers_conversion_test.go
index ea2c10a..3d85bfe 100644
--- a/bp2build/cc_library_headers_conversion_test.go
+++ b/bp2build/cc_library_headers_conversion_test.go
@@ -132,11 +132,7 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    implementation_deps = [
-        ":lib-1",
-        ":lib-2",
-    ],
-    includes = [
+    export_includes = [
         "dir-1",
         "dir-2",
     ] + select({
@@ -145,20 +141,24 @@
         "//build/bazel/platforms/arch:x86_64": ["arch_x86_64_exported_include_dir"],
         "//conditions:default": [],
     }),
+    implementation_deps = [
+        ":lib-1",
+        ":lib-2",
+    ],
 )`, `cc_library_headers(
     name = "lib-1",
     copts = [
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["lib-1"],
+    export_includes = ["lib-1"],
 )`, `cc_library_headers(
     name = "lib-2",
     copts = [
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["lib-2"],
+    export_includes = ["lib-2"],
 )`},
 	})
 }
@@ -337,7 +337,7 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["shared_include_dir"] + select({
+    export_system_includes = ["shared_include_dir"] + select({
         "//build/bazel/platforms/arch:arm": ["arm_include_dir"],
         "//build/bazel/platforms/arch:x86_64": ["x86_64_include_dir"],
         "//conditions:default": [],
@@ -382,7 +382,7 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["lib-1"],
+    export_includes = ["lib-1"],
 )`},
 	})
 }

bp2build/cc_library_static_conversion_test.go

diff --git a/bp2build/cc_library_static_conversion_test.go b/bp2build/cc_library_static_conversion_test.go
index d9145f6..f0225b1 100644
--- a/bp2build/cc_library_static_conversion_test.go
+++ b/bp2build/cc_library_static_conversion_test.go
@@ -192,16 +192,16 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
+    export_includes = [
+        "export_include_dir_1",
+        "export_include_dir_2",
+    ],
     implementation_deps = [
         ":header_lib_1",
         ":header_lib_2",
         ":static_lib_1",
         ":static_lib_2",
     ],
-    includes = [
-        "export_include_dir_1",
-        "export_include_dir_2",
-    ],
     linkstatic = True,
     srcs = [
         "foo_static1.cc",
@@ -312,7 +312,7 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["subpackage"],
+    export_includes = ["subpackage"],
     linkstatic = True,
 )`},
 	})
@@ -341,7 +341,7 @@
         "-I.",
         "-I$(BINDIR)/.",
     ],
-    includes = ["subpackage"],
+    export_system_includes = ["subpackage"],
     linkstatic = True,
 )`},
 	})
@@ -391,7 +391,7 @@
         "-Isubpackage",
         "-I$(BINDIR)/subpackage",
     ],
-    includes = ["./exported_subsubpackage"],
+    export_includes = ["./exported_subsubpackage"],
     linkstatic = True,
 )`},
 	})