Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eaae7d5 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

Add default cc_rustlibs_for_make module to static binaries 

libstatic_rustlibs_for_make contains the set of rustlibs that are included in
libc, bundled together for Make static binaries. This library may grow
to include additional Rust libraries in the future that may be linked in
by other cc_library's included by default with static Rust dependencies.

Bug: 393511828
Bug: 396666286
Test: m <Make static executable with rust_ffi_static deps>
Change-Id: Idf77ec91fccf9666f7275a73c53ca392714b9e6a
parent c0b66fc5

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)