Merge "Use libucrt instead of libmsvcr110"

am: 539b58a55b

Change-Id: Icd150abdb965c589dd0f952444e9c7d8c450eb62
This commit is contained in:
Pirama Arumuga Nainar 2018-12-03 10:01:21 -08:00 committed by android-build-merger
commit c9bc3e23be

View file

@ -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