Commit eadbbe94 authored Mar 03, 2025 by Manish Goregaokar Committed by Automerger Merge Worker Mar 03, 2025

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

Merge "Revert^2 "Add default cc_rustlibs_for_make module to static binaries"" into main am: 8a138759

Original change: https://android-review.googlesource.com/c/platform/build/+/3517954

Change-Id: I21f55377d7472009a8ea6754ff97e0b5ecfea922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/cxx_stl_setup.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
		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)