commit 47fc44c73c948d2aa09b8bc28829a83ec5cc4f97
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 05 21:01:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 05 21:01:55 2023 +0000
tree 6f51faf2eaf062b91cd5ec12b902e8009f05fc63
parent c22ef226a3965deee2b123a74e03288daf012e45
parent e620266d1c4440958b1fbcf5cc850704f5ed750a

Merge "Nullability check for time module."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index b9edfb0..6442bc9 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2272,8 +2272,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",
@@ -2283,17 +2283,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",
     ],