commit 6393098ecfd94c08e4e6f405227bda792413a7c2
author Jingwen Chen <jingwen@google.com> Wed Mar 24 10:04:33 2021 -0400
committer Jingwen Chen <jingwen@google.com> Fri Apr 09 09:42:53 2021 +0000
tree 992247188b4ad67da859dcdbab5f2390146173bd
parent 190ba3ea820f7a4500d6fb4fb70553a6667868a0

bp2build: cc_library converter for //bionic/libdl:libdl_android

This CL contains the converter for libdl_android, a cc_library that
expands into a cc_shared_library and a regular cc_library.

Test: TH
Test: bp2build; bazel test //build/bazel/tests/...

Change-Id: If70641a538211b0d6b2aac0e4d0d06912318304d

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 ef528e9..a6a0028 100644
--- a/bp2build/cc_library_static_conversion_test.go
+++ b/bp2build/cc_library_static_conversion_test.go
@@ -194,6 +194,8 @@
         ":whole_static_lib_2",
     ],
     hdrs = [
+        "implicit_include_1.h",
+        "implicit_include_2.h",
         "export_include_dir_1/export_include_dir_1_a.h",
         "export_include_dir_1/export_include_dir_1_b.h",
         "export_include_dir_2/export_include_dir_2_a.h",
@@ -212,8 +214,6 @@
     srcs = [
         "foo_static1.cc",
         "foo_static2.cc",
-        "implicit_include_1.h",
-        "implicit_include_2.h",
         "include_dir_1/include_dir_1_a.h",
         "include_dir_1/include_dir_1_b.h",
         "include_dir_2/include_dir_2_a.h",
@@ -222,50 +222,68 @@
         "local_include_dir_1/local_include_dir_1_b.h",
         "local_include_dir_2/local_include_dir_2_a.h",
         "local_include_dir_2/local_include_dir_2_b.h",
+        "implicit_include_1.h",
+        "implicit_include_2.h",
     ],
 )`, `cc_library_static(
     name = "static_lib_1",
+    hdrs = [
+        "implicit_include_1.h",
+        "implicit_include_2.h",
+    ],
     includes = [
         ".",
     ],
     linkstatic = True,
     srcs = [
+        "static_lib_1.cc",
         "implicit_include_1.h",
         "implicit_include_2.h",
-        "static_lib_1.cc",
     ],
 )`, `cc_library_static(
     name = "static_lib_2",
+    hdrs = [
+        "implicit_include_1.h",
+        "implicit_include_2.h",
+    ],
     includes = [
         ".",
     ],
     linkstatic = True,
     srcs = [
+        "static_lib_2.cc",
         "implicit_include_1.h",
         "implicit_include_2.h",
-        "static_lib_2.cc",
     ],
 )`, `cc_library_static(
     name = "whole_static_lib_1",
+    hdrs = [
+        "implicit_include_1.h",
+        "implicit_include_2.h",
+    ],
     includes = [
         ".",
     ],
     linkstatic = True,
     srcs = [
+        "whole_static_lib_1.cc",
         "implicit_include_1.h",
         "implicit_include_2.h",
-        "whole_static_lib_1.cc",
     ],
 )`, `cc_library_static(
     name = "whole_static_lib_2",
+    hdrs = [
+        "implicit_include_1.h",
+        "implicit_include_2.h",
+    ],
     includes = [
         ".",
     ],
     linkstatic = True,
     srcs = [
+        "whole_static_lib_2.cc",
         "implicit_include_1.h",
         "implicit_include_2.h",
-        "whole_static_lib_2.cc",
     ],
 )`},
 		},