commit fd67934d6ec012a6cd0e83cecca340c6d38bee7e
author Liz Kammer <eakammer@google.com> Mon Mar 15 20:01:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 15 20:01:38 2021 +0000
tree 982c0293005fa4349e82c9216012a2e59e04ac73
parent 3caa73af1e2520ad2dfb3875e481bd4a21b79cae
parent d7676cc86cf2781df58bb75d1d2f32d69094f11b

Merge "Merge crt cc_objects" am: 821e375664 am: d7676cc86c

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1624701

Change-Id: I4733dddc2db6168d1eaf6a3207a39d162ad54e5f

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index df8871a..f5f9507 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2112,23 +2112,12 @@
 }
 
 cc_object {
-    name: "crtbegin_so1",
+    name: "crtbegin_so",
     local_include_dirs: ["include"],
     srcs: ["arch-common/bionic/crtbegin_so.c"],
 
     defaults: ["crt_so_defaults"],
-
-    bazel_module: {
-        bp2build_available: true,
-    },
-}
-
-cc_object {
-    name: "crtbegin_so",
-
-    defaults: ["crt_so_defaults"],
     objs: [
-        "crtbegin_so1",
         "crtbrand",
     ],
 
@@ -2146,24 +2135,15 @@
 }
 
 cc_object {
-    name: "crtbegin_static1",
+    name: "crtbegin_static",
+
     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 {
-    name: "crtbegin_static",
-
     objs: [
-        "crtbegin_static1",
         "crtbrand",
     ],
     defaults: ["crt_defaults"],
@@ -2174,22 +2154,14 @@
 }
 
 cc_object {
-    name: "crtbegin_dynamic1",
+    name: "crtbegin_dynamic",
+
     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 {
-    name: "crtbegin_dynamic",
-
     objs: [
-        "crtbegin_dynamic1",
         "crtbrand",
     ],
     target: {