commit 5e4a499e25c81d67f22a77cfc9b2b4b99c1316d0
author Jingwen Chen <jingwen@google.com> Sat Feb 20 04:53:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 20 04:53:19 2021 +0000
tree 00407f4aa2815d1499aa24ae4721a300350882cc
parent 526a888d3fda2b17687e7ca0c7a311b742a90db3
parent 0b1611e6375f8b427e532be9e987692177768f45

Merge "bp2build: convert more cc_objects."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 2db2edf..4d44bf3 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2079,6 +2079,7 @@
     srcs: ["arch-common/bionic/crtbegin_so.c"],
 
     defaults: ["crt_so_defaults"],
+
     bazel_module: { bp2build_available: true },
 }
 
@@ -2098,15 +2099,22 @@
     srcs: ["arch-common/bionic/crtend_so.S"],
 
     defaults: ["crt_so_defaults"],
+
+    bazel_module: { bp2build_available: true },
 }
 
 cc_object {
     name: "crtbegin_static1",
-    local_include_dirs: ["include"],
+    local_include_dirs: [
+        "include",
+        "bionic", // crtbegin.c includes bionic/libc_init_common.h
+    ],
     srcs: ["arch-common/bionic/crtbegin.c"],
     defaults: ["crt_defaults"],
     // When using libc.a, we're using the latest library regardless of target API level.
     min_sdk_version: "current",
+
+    bazel_module: { bp2build_available: true },
 }
 
 cc_object {
@@ -2123,9 +2131,14 @@
 
 cc_object {
     name: "crtbegin_dynamic1",
-    local_include_dirs: ["include"],
+    local_include_dirs: [
+        "include",
+        "bionic", // crtbegin.c includes bionic/libc_init_common.h
+    ],
     srcs: ["arch-common/bionic/crtbegin.c"],
     defaults: ["crt_defaults"],
+
+    bazel_module: { bp2build_available: true },
 }
 
 cc_object {
@@ -2154,6 +2167,8 @@
     srcs: ["arch-common/bionic/crtend.S"],
 
     defaults: ["crt_defaults"],
+
+    bazel_module: { bp2build_available: true },
 }
 
 cc_library_static {