Merge "Rename confusingly named libc_llndk_headers." into main
diff --git a/libc/Android.bp b/libc/Android.bp
index a81999d..c6b1924 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1688,7 +1688,7 @@
         symbol_file: "libc.map.txt",
         export_headers_as_system: true,
         export_preprocessed_headers: ["include"],
-        export_llndk_headers: ["libc_llndk_headers"],
+        export_llndk_headers: ["libc_uapi_headers"],
     },
 }
 
@@ -1799,7 +1799,7 @@
 }
 
 cc_library_headers {
-    name: "libc_llndk_headers",
+    name: "libc_uapi_headers",
     visibility: [
         "//external/musl",
     ],
@@ -1894,13 +1894,13 @@
     target: {
         android: {
             export_system_include_dirs: ["include"],
-            header_libs: ["libc_llndk_headers"],
-            export_header_lib_headers: ["libc_llndk_headers"],
+            header_libs: ["libc_uapi_headers"],
+            export_header_lib_headers: ["libc_uapi_headers"],
         },
         linux_bionic: {
             export_system_include_dirs: ["include"],
-            header_libs: ["libc_llndk_headers"],
-            export_header_lib_headers: ["libc_llndk_headers"],
+            header_libs: ["libc_uapi_headers"],
+            export_header_lib_headers: ["libc_uapi_headers"],
         },
     },
 }