commit e0d06f521182c53ec027e41bee2db285b270f469
author me-cafebabe <me.cafebabe@gmail.com> Thu Oct 05 19:38:27 2023 +0000
committer Jis G Jacob <studiokeys@blissroms.org> Wed Jun 12 13:16:43 2024 -0400
tree 935d1018caab3d97ccdf1bd2c81b1c87a173635f
parent 6c66f94d19fd3a80ab0f8af372ba20377545fcb8

libc: libstdc++: Rename vendor variant to libstdc++_vendor

* In Android 14, This library got listed on /vendor/etc/linker.config.pb,
  which is duplicated with /system/etc/linker.config.pb, as a result
  linkerconfig fails and stops the entire system from booting.

[    5.840677] DEBUG: Abort message: 'duplicate: libstdc++.so is provided by default and system in [vendor]'

Change-Id: Ib6eee48de87100c2fb0dd765d57ee95d3159c4ef
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 6d2390f..fd14aea 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1952,7 +1952,7 @@
 // libstdc++.so and libstdc++.a.
 // ========================================================
 
-cc_library {
+cc_defaults {
     defaults: ["libc_defaults"],
     include_dirs: ["bionic/libstdc++/include"],
     srcs: [
@@ -1960,13 +1960,12 @@
         "bionic/__cxa_pure_virtual.cpp",
         "bionic/new.cpp",
     ],
-    name: "libstdc++",
+    name: "libstdc++_defaults",
     static_ndk_lib: true,
     static_libs: ["libasync_safe"],
     apex_available: [
         "//apex_available:platform",
     ],
-    vendor_available: true,
 
     static: {
         system_shared_libs: [],
@@ -2004,6 +2003,17 @@
     },
 }
 
+cc_library {
+    name: "libstdc++",
+    defaults: ["libstdc++_defaults"],
+}
+
+cc_library_shared {
+    name: "libstdc++_vendor",
+    defaults: ["libstdc++_defaults"],
+    vendor: true,
+}
+
 genrule {
     name: "libstdc++.arm.map",
     out: ["libstdc++.arm.map.txt"],