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

Commit c9bc3e23 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by android-build-merger
Browse files

Merge "Use libucrt instead of libmsvcr110" 

am: 539b58a5

Change-Id: Icd150abdb965c589dd0f952444e9c7d8c450eb62
parents 42c220c7 539b58a5

core/cxx_stl_setup.mk

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ linux_static_gcclibs := -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group 
darwin_dynamic_gcclibs := -lc -lSystem

darwin_static_gcclibs := NO_STATIC_HOST_BINARIES_ON_DARWIN

windows_dynamic_gcclibs := \

    -Wl,--start-group -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex -lmsvcr110 \

    -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lpsapi \

    -Wl,--start-group -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex \

    -lmsvcrt -lucrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lpsapi \

    -Wl,--end-group

windows_static_gcclibs := NO_STATIC_HOST_BINARIES_ON_WINDOWS