commit 3af5799387381810f440079b47d05474b08982ce
author Pierre-Clément Tosi <ptosi@google.com> Tue Jan 03 17:57:42 2023 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Tue Jan 03 17:57:42 2023 +0000
tree 698c595a66e5a0daaa651ffd7af724df7562a74f
parent 6f78f756a242c3cb82476d9e5e0c1f85faf51e08

Merge librust_baremetal_defaults into its library

Test: m pvmfw_bin
Change-Id: I14e74019fc64865af615d033f508bfb0d71eef2f

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index e1803b8..bf80a84 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2263,8 +2263,8 @@
 // libc dependencies for baremetal Rust projects.
 // ========================================================
 
-cc_defaults {
-    name: "librust_baremetal_defaults",
+cc_library_static {
+    name: "librust_baremetal",
     header_libs: ["libc_headers"],
     include_dirs: [
         "bionic/libc/async_safe/include",
@@ -2274,17 +2274,12 @@
         "-Wall",
         "-Werror",
     ],
-    system_shared_libs: [],
-    nocrt: true,
-    stl: "none",
-}
-
-cc_library_static {
-    name: "librust_baremetal",
-    defaults: ["librust_baremetal_defaults"],
     whole_static_libs: [
         "libarm-optimized-routines-mem",
     ],
+    system_shared_libs: [],
+    nocrt: true,
+    stl: "none",
     visibility: [
         "//packages/modules/Virtualization/vmbase",
     ],