commit 8db86c28a7bd420d6a4162b983e560aa7d752511
author Ivan Lozano <ivanlozano@google.com> Fri Feb 28 11:57:28 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 28 11:57:28 2025 -0800
tree 3ba5d75953ff9b74e354244b706158a32a3c130b
parent f47bccc516ba3ed3ad5ad967d7cd90687e0c5b82

Revert^2 "Add default cc_rustlibs_for_make module to static binaries"

This reverts commit f47bccc516ba3ed3ad5ad967d7cd90687e0c5b82.

Reason for revert: Re-landing bionic changes

Change-Id: Ie9db8d966d06847a2ceb4be9b4e1a48ab94cf661

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 0d557c7..5e8ca7f 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -78,7 +78,7 @@
         my_static_libraries += libc++demangle
 
         ifeq ($(my_link_type),static)
-            my_static_libraries += libm libc libunwind
+            my_static_libraries += libm libc libunwind libstatic_rustlibs_for_make
         endif
     endif
 else ifeq ($(my_cxx_stl),ndk)