diff --git a/obj/apps/apps.ninja b/obj/apps/apps.ninja index 1417ea0..e103142 100644 --- a/obj/apps/apps.ninja +++ b/obj/apps/apps.ninja @@ -9,6 +9,6 @@ target_output_name = apps ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/apps/apps.inputdeps.stamp: ~ diff --git a/obj/ash/ash.ninja b/obj/ash/ash.ninja index 9c35914..9cad31d 100644 --- a/obj/ash/ash.ninja +++ b/obj/ash/ash.ninja @@ -14,4 +14,5 @@ build obj/ash/ash.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -305,4 +306,5 @@ build obj/ash/ash.stamp: obj/ash/resources/resources.stamp ~ obj/ash/strings/strings.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ash/ash_shell_lib.ninja b/obj/ash/ash_shell_lib.ninja index fb2b7d9..6f05887 100644 --- a/obj/ash/ash_shell_lib.ninja +++ b/obj/ash/ash_shell_lib.ninja @@ -9,6 +9,6 @@ target_output_name = ash_shell_lib ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/ash/ash_shell_lib.inputdeps.stamp: ~ diff --git a/obj/ash/ash_shell_lib_with_content.ninja b/obj/ash/ash_shell_lib_with_content.ninja index 58af4ab..2dbb725 100644 --- a/obj/ash/ash_shell_lib_with_content.ninja +++ b/obj/ash/ash_shell_lib_with_content.ninja @@ -9,6 +9,6 @@ target_output_name = ash_shell_lib_with_content ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/ash/ash_shell_lib_with_content.inputdeps.stamp: ~ diff --git a/obj/ash/ash_shell_with_content.ninja b/obj/ash/ash_shell_with_content.ninja index f57481c..a587f03 100644 --- a/obj/ash/ash_shell_with_content.ninja +++ b/obj/ash/ash_shell_with_content.ninja @@ -9,6 +9,6 @@ target_output_name = ash_shell_with_content ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .exe ~ build ./ash_shell_with_content.exe: ~ diff --git a/obj/ash/ash_unittests.ninja b/obj/ash/ash_unittests.ninja index 87743dc..234f421 100644 --- a/obj/ash/ash_unittests.ninja +++ b/obj/ash/ash_unittests.ninja @@ -11,5 +11,5 @@ target_output_name = ash_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .exe ~ diff --git a/obj/ash/ash_with_content.ninja b/obj/ash/ash_with_content.ninja index a57c1dc..d88d60d 100644 --- a/obj/ash/ash_with_content.ninja +++ b/obj/ash/ash_with_content.ninja @@ -12,4 +12,5 @@ build obj/ash/ash_with_content.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -189,4 +190,5 @@ build obj/ash/ash_with_content.stamp: obj/ash/resources/resources.stamp ~ obj/ash/strings/strings.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/base/allocator/allocator_shim.ninja b/obj/base/allocator/allocator_shim.ninja index 90cab71..5e6f967 100644 --- a/obj/base/allocator/allocator_shim.ninja +++ b/obj/base/allocator/allocator_shim.ninja @@ -11,6 +11,4 @@ target_output_name = allocator_shim build obj/base/allocator/allocator_shim.inputdeps.stamp: ~ obj/base/allocator/prep_libc.stamp ~ - obj/base/debugging_flags.stamp ~ - obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ stamp ~ ~ @@ -18,9 +16,4 @@ build obj/base/allocator/allocator_shim.stamp: obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/allocator/prep_libc.stamp ~ - obj/base/base.lib ~ - obj/base/base_paths.lib ~ - obj/base/base_static.lib ~ - obj/base/third_party/dynamic_annotations/dynamic_annotations.lib ~ - obj/third_party/modp_b64/modp_b64.stamp ~ stamp ~ || ~ diff --git a/obj/base/base.ninja b/obj/base/base.ninja index 7d493ad..7442af6 100644 --- a/obj/base/base.ninja +++ b/obj/base/base.ninja @@ -14,8 +14,9 @@ target_output_name = base ~ ~ ldflags = /DEBUG /OPT$:ICF /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib +gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/base/base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -24,4 +25,7 @@ build obj/base/base.inputdeps.stamp: build obj/base/base.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator.stamp ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base/alias.obj ~ obj/base/base/aligned_memory.obj ~ @@ -279,4 +283,5 @@ build obj/base/base.lib: obj/build/config/sanitizers/deps.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/base/base_i18n_perftests.ninja b/obj/base/base_i18n_perftests.ninja index ff5060b..d2184cd 100644 --- a/obj/base/base_i18n_perftests.ninja +++ b/obj/base/base_i18n_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = base_i18n_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./base_i18n_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -460,7 +463,9 @@ build ./base_i18n_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/base/base_i18n_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/base/base_perftests.ninja b/obj/base/base_perftests.ninja index 2e0d5ed..1b9bf3c 100644 --- a/obj/base/base_perftests.ninja +++ b/obj/base/base_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = base_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./base_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -463,7 +466,9 @@ build ./base_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/base/base_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/base/base_unittests.ninja b/obj/base/base_unittests.ninja index 97602e0..dd2b2ba 100644 --- a/obj/base/base_unittests.ninja +++ b/obj/base/base_unittests.ninja @@ -1,3 +1,3 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -DENABLE_MDNS=1 -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PDF=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DDONT_EMBED_BUILD_METADATA -DUSE_ASH=1 -DUSE_AURA=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_OPENSSL=1 -DNO_TCMALLOC -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DENABLE_BACKGROUND=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -D__STD_C -D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DNTDDI_VERSION=0x0A000000 -DPSAPI_VERSION=1 -DWIN32 -D_SECURE_ATL -D_USING_V110_SDK71_ -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 +-DALLOCATOR_SHIM -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST ~ include_dirs = -I.. -Igen -I../third_party/icu/source/common -I../third_party/icu/source/i18n -I../testing/gtest/include -I../testing/gmock/include ~ cflags = /Gy /GS /FS /bigobj /W4 /WX /wd4091 /wd4127 /wd4251 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 /wd4121 /wd4244 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4702 /O1 /Ob2 /Oy- /d2Zi+ /Zc$:inline /Gw /Oi /Zi /MT /wd4267 /wd4800 ~ @@ -16,5 +16,4 @@ build ./base_unittests.exe: gen/base/allocator/allocator/libcmt.lib ~ link ~ - obj/base/allocator/allocator.stamp ~ obj/base/allocator/allocator_shim.stamp ~ obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ diff --git a/obj/base/build_utf8_validator_tables.ninja b/obj/base/build_utf8_validator_tables.ninja index cee2cee..d153d8a 100644 --- a/obj/base/build_utf8_validator_tables.ninja +++ b/obj/base/build_utf8_validator_tables.ninja @@ -9,9 +9,12 @@ target_output_name = build_utf8_validator_tables ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./build_utf8_validator_tables.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -199,7 +202,9 @@ build ./build_utf8_validator_tables.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/base/build_utf8_validator_tables.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/base/check_example.ninja b/obj/base/check_example.ninja index f5772b7..07d3dcb 100644 --- a/obj/base/check_example.ninja +++ b/obj/base/check_example.ninja @@ -9,9 +9,12 @@ target_output_name = check_example ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./check_example.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -22,7 +25,9 @@ build ./check_example.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/base/check_example.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/base/i18n.ninja b/obj/base/i18n.ninja index 6f0ae81..647f97f 100644 --- a/obj/base/i18n.ninja +++ b/obj/base/i18n.ninja @@ -10,4 +10,5 @@ target_output_name = base_i18n ~ build obj/base/base_i18n.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -42,4 +43,5 @@ build obj/base/base_i18n.stamp: ~ build obj/base/i18n.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/base/message_loop_tests.ninja b/obj/base/message_loop_tests.ninja index 6b51769..6bbedf9 100644 --- a/obj/base/message_loop_tests.ninja +++ b/obj/base/message_loop_tests.ninja @@ -10,4 +10,5 @@ target_output_name = message_loop_tests ~ build obj/base/message_loop_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/base/message_loop_tests.inputdeps.stamp: ~ build obj/base/message_loop_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/base/prefs.ninja b/obj/base/prefs.ninja index 11834ba..98b7a75 100644 --- a/obj/base/prefs.ninja +++ b/obj/base/prefs.ninja @@ -10,4 +10,5 @@ target_output_name = prefs ~ build obj/base/prefs.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/base/prefs.inputdeps.stamp: ~ build obj/base/prefs.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/base/prefs_test_support.ninja b/obj/base/prefs_test_support.ninja index d6082fc..41241c1 100644 --- a/obj/base/prefs_test_support.ninja +++ b/obj/base/prefs_test_support.ninja @@ -10,4 +10,5 @@ target_output_name = prefs_test_support ~ build obj/base/prefs_test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/base/prefs_test_support.inputdeps.stamp: ~ build obj/base/prefs_test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/base/test/run_all_unittests.ninja b/obj/base/test/run_all_unittests.ninja index 6fcfa30..8a573b7 100644 --- a/obj/base/test/run_all_unittests.ninja +++ b/obj/base/test/run_all_unittests.ninja @@ -10,4 +10,5 @@ target_output_name = run_all_unittests ~ build obj/base/test/run_all_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/base/test/run_all_unittests.inputdeps.stamp: ~ build obj/base/test/run_all_unittests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/base/test/test_config.ninja b/obj/base/test/test_config.ninja index 380213a..49f326b 100644 --- a/obj/base/test/test_config.ninja +++ b/obj/base/test/test_config.ninja @@ -10,4 +10,5 @@ target_output_name = test_config ~ build obj/base/test/test_config.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/base/test/test_config.inputdeps.stamp: ~ build obj/base/test/test_config.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/base/test/test_launcher_nacl_nonsfi.ninja b/obj/base/test/test_launcher_nacl_nonsfi.ninja index ae0a38e..7c3b7eb 100644 --- a/obj/base/test/test_launcher_nacl_nonsfi.ninja +++ b/obj/base/test/test_launcher_nacl_nonsfi.ninja @@ -10,4 +10,5 @@ target_output_name = test_launcher_nacl_nonsfi ~ build obj/base/test/test_launcher_nacl_nonsfi.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/base/test/test_launcher_nacl_nonsfi.inputdeps.stamp: ~ build obj/base/test/test_launcher_nacl_nonsfi.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/base/test/test_support.ninja b/obj/base/test/test_support.ninja index d976c58..fdd1587 100644 --- a/obj/base/test/test_support.ninja +++ b/obj/base/test/test_support.ninja @@ -12,4 +12,5 @@ target_output_name = test_support ~ build obj/base/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/base/test/test_support.inputdeps.stamp: ~ build obj/base/test/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/base/test/test_support_perf.ninja b/obj/base/test/test_support_perf.ninja index 8db8399..92ec08f 100644 --- a/obj/base/test/test_support_perf.ninja +++ b/obj/base/test/test_support_perf.ninja @@ -10,4 +10,5 @@ target_output_name = test_support_perf ~ build obj/base/test/test_support_perf.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/base/test/test_support_perf.inputdeps.stamp: ~ build obj/base/test/test_support_perf.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/cc/base/base.ninja b/obj/cc/base/base.ninja index 269500b..a56b067 100644 --- a/obj/cc/base/base.ninja +++ b/obj/cc/base/base.ninja @@ -10,4 +10,5 @@ target_output_name = base ~ build obj/cc/base/base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/cc/base/base.inputdeps.stamp: ~ build obj/cc/base/base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/cc/blink/blink.ninja b/obj/cc/blink/blink.ninja index 6df7c86..b6325b0 100644 --- a/obj/cc/blink/blink.ninja +++ b/obj/cc/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = cc_blink ~ build obj/cc/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -260,4 +261,5 @@ build obj/cc/blink/blink/web_transform_operations_impl.obj: ~ build obj/cc/blink/cc_blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/cc/blink/cc_blink_unittests.ninja b/obj/cc/blink/cc_blink_unittests.ninja index 532aad8..082b389 100644 --- a/obj/cc/blink/cc_blink_unittests.ninja +++ b/obj/cc/blink/cc_blink_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = cc_blink_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cc_blink_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7261,7 +7264,9 @@ build ./cc_blink_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/cc/blink/cc_blink_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cc/cc.ninja b/obj/cc/cc.ninja index 2e3bcfc..923201e 100644 --- a/obj/cc/cc.ninja +++ b/obj/cc/cc.ninja @@ -12,4 +12,5 @@ target_output_name = cc ~ build obj/cc/cc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -50,4 +51,5 @@ build obj/cc/cc.inputdeps.stamp: ~ build obj/cc/cc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/cc/cc_perftests.ninja b/obj/cc/cc_perftests.ninja index 7f9a606..325f684 100644 --- a/obj/cc/cc_perftests.ninja +++ b/obj/cc/cc_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = cc_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cc_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3572,7 +3575,9 @@ build ./cc_perftests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cc/cc_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cc/cc_unittests.ninja b/obj/cc/cc_unittests.ninja index 427ecfb..ad8704d 100644 --- a/obj/cc/cc_unittests.ninja +++ b/obj/cc/cc_unittests.ninja @@ -11,10 +11,13 @@ target_output_name = cc_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cc_unittests.exe: ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3718,7 +3721,9 @@ build ./cc_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cc/cc_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cc/surfaces/surface_id.ninja b/obj/cc/surfaces/surface_id.ninja index a1c5750..5d37980 100644 --- a/obj/cc/surfaces/surface_id.ninja +++ b/obj/cc/surfaces/surface_id.ninja @@ -8,4 +8,5 @@ target_output_name = surface_id ~ build obj/cc/surfaces/surface_id.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -13,4 +14,5 @@ build obj/cc/surfaces/surface_id.inputdeps.stamp: ~ build obj/cc/surfaces/surface_id.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/cc/surfaces/surfaces.ninja b/obj/cc/surfaces/surfaces.ninja index 751c496..de232ac 100644 --- a/obj/cc/surfaces/surfaces.ninja +++ b/obj/cc/surfaces/surfaces.ninja @@ -10,4 +10,5 @@ target_output_name = cc_surfaces ~ build obj/cc/surfaces/cc_surfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -123,4 +124,5 @@ build obj/cc/surfaces/cc_surfaces.stamp: ~ build obj/cc/surfaces/surfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cc/test_support.ninja b/obj/cc/test_support.ninja index 6a2e47e..c14528b 100644 --- a/obj/cc/test_support.ninja +++ b/obj/cc/test_support.ninja @@ -12,4 +12,5 @@ target_output_name = test_support ~ build obj/cc/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/cc/test_support.inputdeps.stamp: build obj/cc/test_support.stamp: ~ ./osmesa.dll ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/browser/chrome_process_finder.ninja b/obj/chrome/browser/chrome_process_finder.ninja index c797c88..bc6eeb5 100644 --- a/obj/chrome/browser/chrome_process_finder.ninja +++ b/obj/chrome/browser/chrome_process_finder.ninja @@ -10,4 +10,5 @@ target_output_name = chrome_process_finder ~ build obj/chrome/browser/chrome_process_finder.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/chrome/browser/chrome_process_finder.inputdeps.stamp: ~ build obj/chrome/browser/chrome_process_finder.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/devtools/devtools.ninja b/obj/chrome/browser/devtools/devtools.ninja index c0c1bfd..790784a 100644 --- a/obj/chrome/browser/devtools/devtools.ninja +++ b/obj/chrome/browser/devtools/devtools.ninja @@ -11,8 +11,9 @@ target_output_name = devtools ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/chrome/browser/devtools/devtools.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -213,4 +214,6 @@ build obj/chrome/browser/devtools/devtools.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -591,4 +594,5 @@ build obj/chrome/browser/devtools/devtools.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/browser/media/router/mojo_bindings.ninja b/obj/chrome/browser/media/router/mojo_bindings.ninja index 28102f8..c1c5c1e 100644 --- a/obj/chrome/browser/media/router/mojo_bindings.ninja +++ b/obj/chrome/browser/media/router/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/chrome/browser/media/router/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/browser/media/router/mojo_bindings.inputdeps.stamp: ~ build obj/chrome/browser/media/router/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/media/router/mojo_bindings_cpp_sources.ninja b/obj/chrome/browser/media/router/mojo_bindings_cpp_sources.ninja index e659898..da69997 100644 --- a/obj/chrome/browser/media/router/mojo_bindings_cpp_sources.ninja +++ b/obj/chrome/browser/media/router/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/chrome/browser/media/router/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/chrome/browser/media/router/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/chrome/browser/media/router/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/media/router/router.ninja b/obj/chrome/browser/media/router/router.ninja index bf04920..362ebb2 100644 --- a/obj/chrome/browser/media/router/router.ninja +++ b/obj/chrome/browser/media/router/router.ninja @@ -9,8 +9,9 @@ target_output_name = router ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/chrome/browser/media/router/router.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -206,4 +207,6 @@ build obj/chrome/browser/media/router/router.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -595,4 +598,5 @@ build obj/chrome/browser/media/router/router.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.ninja b/obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.ninja index 7645650..d3f6a23 100644 --- a/obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.ninja +++ b/obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.ninja @@ -10,4 +10,5 @@ target_output_name = chrome_ui_string_overrider_factory ~ build obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.i ~ build obj/chrome/browser/metrics/variations/chrome_ui_string_overrider_factory.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/browser/policy/path_parser.ninja b/obj/chrome/browser/policy/path_parser.ninja index b115a47..9f1f4e5 100644 --- a/obj/chrome/browser/policy/path_parser.ninja +++ b/obj/chrome/browser/policy/path_parser.ninja @@ -10,4 +10,5 @@ target_output_name = path_parser ~ build obj/chrome/browser/policy/path_parser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/chrome/browser/policy/path_parser.inputdeps.stamp: ~ build obj/chrome/browser/policy/path_parser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/rlz.ninja b/obj/chrome/browser/rlz.ninja index 84f9141..438511b 100644 --- a/obj/chrome/browser/rlz.ninja +++ b/obj/chrome/browser/rlz.ninja @@ -10,4 +10,5 @@ target_output_name = rlz ~ build obj/chrome/browser/rlz.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -193,4 +194,5 @@ build obj/chrome/browser/rlz.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/browser/test_support_ui.ninja b/obj/chrome/browser/test_support_ui.ninja index d89797c..81d0625 100644 --- a/obj/chrome/browser/test_support_ui.ninja +++ b/obj/chrome/browser/test_support_ui.ninja @@ -12,4 +12,5 @@ target_output_name = test_support_ui ~ build obj/chrome/browser/test_support_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -76,4 +77,5 @@ build obj/chrome/browser/test_support_ui.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/browser/ui/views/views.ninja b/obj/chrome/browser/ui/views/views.ninja index 2ffa029..4e8f2ab 100644 --- a/obj/chrome/browser/ui/views/views.ninja +++ b/obj/chrome/browser/ui/views/views.ninja @@ -15,4 +15,5 @@ build obj/chrome/browser/ui/views/browser_ui_views.stamp: obj/ash/resources/resources.stamp ~ obj/ash/strings/strings.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -163,4 +164,5 @@ build obj/chrome/browser/ui/views/views.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/browser/ui/webui/engagement/mojo_bindings.ninja b/obj/chrome/browser/ui/webui/engagement/mojo_bindings.ninja index 47af767..e2f7b1b 100644 --- a/obj/chrome/browser/ui/webui/engagement/mojo_bindings.ninja +++ b/obj/chrome/browser/ui/webui/engagement/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/chrome/browser/ui/webui/engagement/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/browser/ui/webui/engagement/mojo_bindings.inputdeps.stamp: ~ build obj/chrome/browser/ui/webui/engagement/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.ninja b/obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.ninja index 393ded7..fcbc483 100644 --- a/obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.ninja +++ b/obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.inputdeps ~ build obj/chrome/browser/ui/webui/engagement/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/ui/webui/omnibox/mojo_bindings.ninja b/obj/chrome/browser/ui/webui/omnibox/mojo_bindings.ninja index 999081e..a59e6d2 100644 --- a/obj/chrome/browser/ui/webui/omnibox/mojo_bindings.ninja +++ b/obj/chrome/browser/ui/webui/omnibox/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings.inputdeps.stamp: ~ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.ninja b/obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.ninja index 47f9635..a53182d 100644 --- a/obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.ninja +++ b/obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.inputdeps.st ~ build obj/chrome/browser/ui/webui/omnibox/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/child/child.ninja b/obj/chrome/child/child.ninja index fb9a334..3f9f357 100644 --- a/obj/chrome/child/child.ninja +++ b/obj/chrome/child/child.ninja @@ -9,8 +9,9 @@ target_output_name = child ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib winmm.lib ws2_32.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib ~ output_extension = .lib ~ build obj/chrome/child/child.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -149,4 +150,6 @@ build obj/chrome/child/child.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -395,4 +398,5 @@ build obj/chrome/child/child.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/chrome_child.ninja b/obj/chrome/chrome_child.ninja index 1f12f73..2b327de 100644 --- a/obj/chrome/chrome_child.ninja +++ b/obj/chrome/chrome_child.ninja @@ -9,5 +9,5 @@ target_output_name = chrome_child ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .dll ~ diff --git a/obj/chrome/chrome_initial.ninja b/obj/chrome/chrome_initial.ninja index 3185fec..f5f7399 100644 --- a/obj/chrome/chrome_initial.ninja +++ b/obj/chrome/chrome_initial.ninja @@ -9,6 +9,6 @@ target_output_name = initialexe/chrome ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ build ./initialexe/chrome.exe: ~ @@ -18,5 +18,8 @@ build ./initialexe/chrome.exe: ./delegate_execute.exe ~ ./metro_driver.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1777,4 +1780,5 @@ build ./initialexe/chrome.exe: obj/ui/gfx/gfx/window_impl.obj ~ obj/ui/gfx/gfx_export.stamp ~ +| ~ || ~ ~ @@ -1782,4 +1786,5 @@ build obj/chrome/chrome_initial.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/chrome_watcher/chrome_watcher.ninja b/obj/chrome/chrome_watcher/chrome_watcher.ninja index cb68eed..5627fdb 100644 --- a/obj/chrome/chrome_watcher/chrome_watcher.ninja +++ b/obj/chrome/chrome_watcher/chrome_watcher.ninja @@ -9,8 +9,11 @@ target_output_name = chrome_watcher ~ ~ ldflags = /DEF$:../chrome/chrome_watcher/chrome_watcher.def /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./chrome_watcher.dll ./chrome_watcher.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -877,8 +880,10 @@ build ./chrome_watcher.dll ./chrome_watcher.dll.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ solink ~ +| ~ || ~ ~ build obj/chrome/chrome_watcher/chrome_watcher.inputdeps.stamp: ~ ../chrome/chrome_watcher/chrome_watcher.def ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/chrome_watcher/client.ninja b/obj/chrome/chrome_watcher/client.ninja index f907bd1..6c2b788 100644 --- a/obj/chrome/chrome_watcher/client.ninja +++ b/obj/chrome/chrome_watcher/client.ninja @@ -10,4 +10,5 @@ target_output_name = client ~ build obj/chrome/chrome_watcher/client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/chrome_watcher/client.inputdeps.stamp: ~ build obj/chrome/chrome_watcher/client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/common/app_mode_app_support.ninja b/obj/chrome/common/app_mode_app_support.ninja index 96f7451..070b559 100644 --- a/obj/chrome/common/app_mode_app_support.ninja +++ b/obj/chrome/common/app_mode_app_support.ninja @@ -7,8 +7,9 @@ target_output_name = app_mode_app_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/chrome/common/app_mode_app_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/chrome/common/app_mode_app_support.inputdeps.stamp: build obj/chrome/common/app_mode_app_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -30,4 +33,5 @@ build obj/chrome/common/app_mode_app_support.lib: obj/content/public/common/result_codes.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/common/common.ninja b/obj/chrome/common/common.ninja index df9f235..8cf084d 100644 --- a/obj/chrome/common/common.ninja +++ b/obj/chrome/common/common.ninja @@ -11,8 +11,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/chrome/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -235,4 +236,6 @@ build obj/chrome/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -763,4 +766,5 @@ build obj/chrome/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/common/constants.ninja b/obj/chrome/common/constants.ninja index b411d68..5ebbffc 100644 --- a/obj/chrome/common/constants.ninja +++ b/obj/chrome/common/constants.ninja @@ -9,8 +9,9 @@ target_output_name = constants ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/chrome/common/constants.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,6 @@ build obj/chrome/common/constants.inputdeps.stamp: build obj/chrome/common/constants.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -41,4 +44,5 @@ build obj/chrome/common/constants.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/widevine/cdm/version_h.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/common/extensions/api/api.ninja b/obj/chrome/common/extensions/api/api.ninja index eaf7776..5a02497 100644 --- a/obj/chrome/common/extensions/api/api.ninja +++ b/obj/chrome/common/extensions/api/api.ninja @@ -12,4 +12,5 @@ target_output_name = api ~ build obj/chrome/common/extensions/api/api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -23,4 +24,5 @@ build obj/chrome/common/extensions/api/api.inputdeps.stamp: ~ build obj/chrome/common/extensions/api/api.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/common/extensions/api/api_registration.ninja b/obj/chrome/common/extensions/api/api_registration.ninja index 58611bc..84552a9 100644 --- a/obj/chrome/common/extensions/api/api_registration.ninja +++ b/obj/chrome/common/extensions/api/api_registration.ninja @@ -11,8 +11,9 @@ target_output_name = api_registration ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/chrome/common/extensions/api/api_registration.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -210,4 +211,6 @@ build obj/chrome/common/extensions/api/api_registration.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -579,4 +582,5 @@ build obj/chrome/common/extensions/api/api_registration.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/common/mojo_bindings.ninja b/obj/chrome/common/mojo_bindings.ninja index dd1e99b..21572dd 100644 --- a/obj/chrome/common/mojo_bindings.ninja +++ b/obj/chrome/common/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/chrome/common/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/common/mojo_bindings.inputdeps.stamp: ~ build obj/chrome/common/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/common/mojo_bindings_cpp_sources.ninja b/obj/chrome/common/mojo_bindings_cpp_sources.ninja index 158aaf7..3127caa 100644 --- a/obj/chrome/common/mojo_bindings_cpp_sources.ninja +++ b/obj/chrome/common/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/chrome/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/chrome/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/chrome/common/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/common/net/net.ninja b/obj/chrome/common/net/net.ninja index 009a537..24139f9 100644 --- a/obj/chrome/common/net/net.ninja +++ b/obj/chrome/common/net/net.ninja @@ -9,8 +9,9 @@ target_output_name = net ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/chrome/common/net/net.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,6 @@ build obj/chrome/common/net/net.inputdeps.stamp: build obj/chrome/common/net/net.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -126,4 +129,5 @@ build obj/chrome/common/net/net.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/common/test_support.ninja b/obj/chrome/common/test_support.ninja index e5fe239..933a9ca 100644 --- a/obj/chrome/common/test_support.ninja +++ b/obj/chrome/common/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/chrome/common/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -229,4 +230,5 @@ build obj/chrome/common/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/file_pre_reader.ninja b/obj/chrome/file_pre_reader.ninja index 6d368db..752b766 100644 --- a/obj/chrome/file_pre_reader.ninja +++ b/obj/chrome/file_pre_reader.ninja @@ -10,4 +10,5 @@ target_output_name = file_pre_reader ~ build obj/chrome/file_pre_reader.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/chrome/file_pre_reader.inputdeps.stamp: ~ build obj/chrome/file_pre_reader.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/installer/gcapi/gcapi.ninja b/obj/chrome/installer/gcapi/gcapi.ninja index 4ddb04a..cc398f7 100644 --- a/obj/chrome/installer/gcapi/gcapi.ninja +++ b/obj/chrome/installer/gcapi/gcapi.ninja @@ -9,9 +9,12 @@ target_output_name = gcapi_dll ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" /DEF:../chrome/installer/gcapi/gcapi.def ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./gcapi_dll.dll ./gcapi_dll.dll.lib: ~ ../chrome/installer/gcapi/gcapi.def ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -879,4 +882,5 @@ build ./gcapi_dll.dll ./gcapi_dll.dll.lib: ~ build obj/chrome/installer/gcapi/gcapi.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/installer/gcapi/gcapi_test.ninja b/obj/chrome/installer/gcapi/gcapi_test.ninja index 99a615d..9de0eed 100644 --- a/obj/chrome/installer/gcapi/gcapi_test.ninja +++ b/obj/chrome/installer/gcapi/gcapi_test.ninja @@ -9,10 +9,13 @@ target_output_name = gcapi_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gcapi_test.exe: ~ ./gcapi_dll.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -930,7 +933,9 @@ build ./gcapi_test.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome/installer/gcapi/gcapi_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/installer/gcapi/lib.ninja b/obj/chrome/installer/gcapi/lib.ninja index 9ad4579..b91a75e 100644 --- a/obj/chrome/installer/gcapi/lib.ninja +++ b/obj/chrome/installer/gcapi/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/chrome/installer/gcapi/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/chrome/installer/gcapi/lib.inputdeps.stamp: ~ build obj/chrome/installer/gcapi/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/installer/launcher_support/launcher_support.ninja b/obj/chrome/installer/launcher_support/launcher_support.ninja index 87b6cba..07950bc 100644 --- a/obj/chrome/installer/launcher_support/launcher_support.ninja +++ b/obj/chrome/installer/launcher_support/launcher_support.ninja @@ -10,4 +10,5 @@ target_output_name = launcher_support ~ build obj/chrome/installer/launcher_support/launcher_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/installer/launcher_support/launcher_support.inputdeps.stamp: ~ build obj/chrome/installer/launcher_support/launcher_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/installer/mini_installer/mini_installer.ninja b/obj/chrome/installer/mini_installer/mini_installer.ninja index 922a31f..c7c2714 100644 --- a/obj/chrome/installer/mini_installer/mini_installer.ninja +++ b/obj/chrome/installer/mini_installer/mini_installer.ninja @@ -9,8 +9,9 @@ target_output_name = mini_installer ~ ~ ldflags = /ENTRY$:MainEntryPoint /FIXED$:NO /NXCOMPAT /OPT$:ICF /DEBUG /INCREMENTAL$:NO /MACHINE$:X64 /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = setupapi.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib credui.lib netapi32.lib ndfapi.lib ~ output_extension = .exe ~ build ./mini_installer.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ obj/build/config/sanitizers/deps.stamp ~ @@ -31,4 +32,5 @@ build ./mini_installer.exe: obj/chrome/installer/mini_installer/version.stamp ~ obj/chrome/installer/mini_installer/version/mini_installer_version.res ~ +| ~ || ~ ~ diff --git a/obj/chrome/installer/mini_installer/unit_tests.ninja b/obj/chrome/installer/mini_installer/unit_tests.ninja index 0ac1342..3e25236 100644 --- a/obj/chrome/installer/mini_installer/unit_tests.ninja +++ b/obj/chrome/installer/mini_installer/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/chrome/installer/mini_installer/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome/installer/mini_installer/unit_tests.inputdeps.stamp: ~ build obj/chrome/installer/mini_installer/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome/installer/setup/lib.ninja b/obj/chrome/installer/setup/lib.ninja index a85dbc8..ace4454 100644 --- a/obj/chrome/installer/setup/lib.ninja +++ b/obj/chrome/installer/setup/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/chrome/installer/setup/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/chrome/installer/setup/lib.inputdeps.stamp: ~ build obj/chrome/installer/setup/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/installer/test/alternate_version_generator.ninja b/obj/chrome/installer/test/alternate_version_generator.ninja index 309ab1d..3592ff0 100644 --- a/obj/chrome/installer/test/alternate_version_generator.ninja +++ b/obj/chrome/installer/test/alternate_version_generator.ninja @@ -9,9 +9,12 @@ target_output_name = alternate_version_generator ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./alternate_version_generator.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -922,7 +925,9 @@ build ./alternate_version_generator.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome/installer/test/alternate_version_generator.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/installer/test/alternate_version_generator_lib.ninja b/obj/chrome/installer/test/alternate_version_generator_lib.ninja index 6d63693..05ea7f8 100644 --- a/obj/chrome/installer/test/alternate_version_generator_lib.ninja +++ b/obj/chrome/installer/test/alternate_version_generator_lib.ninja @@ -10,4 +10,5 @@ target_output_name = alternate_version_generator_lib ~ build obj/chrome/installer/test/alternate_version_generator_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/chrome/installer/test/alternate_version_generator_lib.inputdeps.stamp: ~ build obj/chrome/installer/test/alternate_version_generator_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/installer/test/upgrade_test.ninja b/obj/chrome/installer/test/upgrade_test.ninja index c532cd4..e2b99e7 100644 --- a/obj/chrome/installer/test/upgrade_test.ninja +++ b/obj/chrome/installer/test/upgrade_test.ninja @@ -9,9 +9,12 @@ target_output_name = upgrade_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./upgrade_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -925,7 +928,9 @@ build ./upgrade_test.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome/installer/test/upgrade_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/installer/util/installer_util_unittests.ninja b/obj/chrome/installer/util/installer_util_unittests.ninja index b309f61..cafbc13 100644 --- a/obj/chrome/installer/util/installer_util_unittests.ninja +++ b/obj/chrome/installer/util/installer_util_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = installer_util_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ build ./installer_util_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -10171,7 +10174,9 @@ build ./installer_util_unittests.exe: obj/win8/metro_viewer_constants.stamp ~ obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ +| ~ || ~ ~ build obj/chrome/installer/util/installer_util_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/installer/util/with_no_strings.ninja b/obj/chrome/installer/util/with_no_strings.ninja index 0ed0573..8467792 100644 --- a/obj/chrome/installer/util/with_no_strings.ninja +++ b/obj/chrome/installer/util/with_no_strings.ninja @@ -11,8 +11,9 @@ target_output_name = with_no_strings ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/chrome/installer/util/with_no_strings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -49,4 +50,6 @@ build obj/chrome/installer/util/with_no_strings.inputdeps.stamp: build obj/chrome/installer/util/with_no_strings.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -153,4 +156,5 @@ build obj/chrome/installer/util/with_no_strings.lib: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ diff --git a/obj/chrome/main_dll.ninja b/obj/chrome/main_dll.ninja index aa8d9eb..24453ec 100644 --- a/obj/chrome/main_dll.ninja +++ b/obj/chrome/main_dll.ninja @@ -9,5 +9,5 @@ target_output_name = chrome ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib credui.lib netapi32.lib ndfapi.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib rpcrt4.lib winhttp.lib ~ output_extension = .dll ~ diff --git a/obj/chrome/plugin/plugin.ninja b/obj/chrome/plugin/plugin.ninja index 2763c01..a91cba2 100644 --- a/obj/chrome/plugin/plugin.ninja +++ b/obj/chrome/plugin/plugin.ninja @@ -9,8 +9,9 @@ target_output_name = plugin ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/chrome/plugin/plugin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -152,4 +153,6 @@ build obj/chrome/plugin/plugin.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -392,4 +395,5 @@ build obj/chrome/plugin/plugin.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/renderer/renderer.ninja b/obj/chrome/renderer/renderer.ninja index 2e51d97..155ea63 100644 --- a/obj/chrome/renderer/renderer.ninja +++ b/obj/chrome/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/chrome/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/chrome/reorder_imports.ninja b/obj/chrome/reorder_imports.ninja index a15adef..f96093b 100644 --- a/obj/chrome/reorder_imports.ninja +++ b/obj/chrome/reorder_imports.ninja @@ -16,4 +16,5 @@ build obj/chrome/reorder_imports.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/service/service.ninja b/obj/chrome/service/service.ninja index 782353c..dba0f8c 100644 --- a/obj/chrome/service/service.ninja +++ b/obj/chrome/service/service.ninja @@ -9,8 +9,9 @@ target_output_name = service ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/chrome/service/service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -233,4 +234,6 @@ build obj/chrome/service/service.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -670,4 +673,5 @@ build obj/chrome/service/service.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome/test/browser_tests.ninja b/obj/chrome/test/browser_tests.ninja index 0121b4d..7be4adb 100644 --- a/obj/chrome/test/browser_tests.ninja +++ b/obj/chrome/test/browser_tests.ninja @@ -11,6 +11,6 @@ target_output_name = browser_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /DELAYLOAD$:ndfapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib credui.lib netapi32.lib ndfapi.lib -gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ build ./browser_tests.exe: ~ diff --git a/obj/chrome/test/chrome_app_unittests.ninja b/obj/chrome/test/chrome_app_unittests.ninja index c1a9260..108ca98 100644 --- a/obj/chrome/test/chrome_app_unittests.ninja +++ b/obj/chrome/test/chrome_app_unittests.ninja @@ -9,6 +9,6 @@ target_output_name = chrome_app_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib credui.lib netapi32.lib ndfapi.lib -gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ build ./chrome_app_unittests.exe: ~ diff --git a/obj/chrome/test/chromedriver/automation_client_lib.ninja b/obj/chrome/test/chromedriver/automation_client_lib.ninja index 34db58c..b3c9283 100644 --- a/obj/chrome/test/chromedriver/automation_client_lib.ninja +++ b/obj/chrome/test/chromedriver/automation_client_lib.ninja @@ -10,4 +10,5 @@ target_output_name = automation_client_lib ~ build obj/chrome/test/chromedriver/automation_client_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/chrome/test/chromedriver/automation_client_lib.inputdeps.stamp: ~ build obj/chrome/test/chromedriver/automation_client_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/test/chromedriver/chromedriver.ninja b/obj/chrome/test/chromedriver/chromedriver.ninja index cd7233a..4ab6c73 100644 --- a/obj/chrome/test/chromedriver/chromedriver.ninja +++ b/obj/chrome/test/chromedriver/chromedriver.ninja @@ -9,9 +9,12 @@ target_output_name = chromedriver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./chromedriver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2320,7 +2323,9 @@ build ./chromedriver.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/chrome/test/chromedriver/chromedriver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/test/chromedriver/chromedriver_tests.ninja b/obj/chrome/test/chromedriver/chromedriver_tests.ninja index f987ecc..9f545bc 100644 --- a/obj/chrome/test/chromedriver/chromedriver_tests.ninja +++ b/obj/chrome/test/chromedriver/chromedriver_tests.ninja @@ -9,9 +9,12 @@ target_output_name = chromedriver_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./chromedriver_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2838,7 +2841,9 @@ build ./chromedriver_tests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/chrome/test/chromedriver/chromedriver_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/test/chromedriver/chromedriver_unittests.ninja b/obj/chrome/test/chromedriver/chromedriver_unittests.ninja index aed20e2..a73497e 100644 --- a/obj/chrome/test/chromedriver/chromedriver_unittests.ninja +++ b/obj/chrome/test/chromedriver/chromedriver_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = chromedriver_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./chromedriver_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2400,7 +2403,9 @@ build ./chromedriver_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/chrome/test/chromedriver/chromedriver_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/test/chromedriver/lib.ninja b/obj/chrome/test/chromedriver/lib.ninja index 61f3aaf..7068959 100644 --- a/obj/chrome/test/chromedriver/lib.ninja +++ b/obj/chrome/test/chromedriver/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/chrome/test/chromedriver/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/chrome/test/chromedriver/lib.inputdeps.stamp: ~ build obj/chrome/test/chromedriver/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/test/interactive_ui_tests.ninja b/obj/chrome/test/interactive_ui_tests.ninja index 0fd93db..7ac710c 100644 --- a/obj/chrome/test/interactive_ui_tests.ninja +++ b/obj/chrome/test/interactive_ui_tests.ninja @@ -11,6 +11,6 @@ target_output_name = interactive_ui_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = oleacc.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib credui.lib netapi32.lib ndfapi.lib -gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ build ./interactive_ui_tests.exe: ~ diff --git a/obj/chrome/test/load_library_perf_tests.ninja b/obj/chrome/test/load_library_perf_tests.ninja index 782f5aa..0113aaa 100644 --- a/obj/chrome/test/load_library_perf_tests.ninja +++ b/obj/chrome/test/load_library_perf_tests.ninja @@ -9,10 +9,13 @@ target_output_name = load_library_perf_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./load_library_perf_tests.exe: ~ ./clearkeycdmadapter.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -465,7 +468,9 @@ build ./load_library_perf_tests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome/test/load_library_perf_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/test/performance_browser_tests.ninja b/obj/chrome/test/performance_browser_tests.ninja index 99d3484..f993a53 100644 --- a/obj/chrome/test/performance_browser_tests.ninja +++ b/obj/chrome/test/performance_browser_tests.ninja @@ -9,6 +9,6 @@ target_output_name = performance_browser_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib credui.lib netapi32.lib ndfapi.lib -gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ build ./performance_browser_tests.exe: ~ diff --git a/obj/chrome/test/sync_integration_tests.ninja b/obj/chrome/test/sync_integration_tests.ninja index f60d188..9ca5905 100644 --- a/obj/chrome/test/sync_integration_tests.ninja +++ b/obj/chrome/test/sync_integration_tests.ninja @@ -9,5 +9,5 @@ target_output_name = sync_integration_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib credui.lib netapi32.lib ndfapi.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ diff --git a/obj/chrome/test/sync_performance_tests.ninja b/obj/chrome/test/sync_performance_tests.ninja index 2b1b8b7..3e11cf4 100644 --- a/obj/chrome/test/sync_performance_tests.ninja +++ b/obj/chrome/test/sync_performance_tests.ninja @@ -9,5 +9,5 @@ target_output_name = sync_performance_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib credui.lib netapi32.lib ndfapi.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib rpcrt4.lib winhttp.lib ~ output_extension = .exe ~ diff --git a/obj/chrome/test/test_support_ui.ninja b/obj/chrome/test/test_support_ui.ninja index d565b87..9da2fd7 100644 --- a/obj/chrome/test/test_support_ui.ninja +++ b/obj/chrome/test/test_support_ui.ninja @@ -12,4 +12,5 @@ target_output_name = test_support_ui ~ build obj/chrome/test/test_support_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -76,4 +77,5 @@ build obj/chrome/test/test_support_ui.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/test/unit_tests.ninja b/obj/chrome/test/unit_tests.ninja index 93d67c0..606481c 100644 --- a/obj/chrome/test/unit_tests.ninja +++ b/obj/chrome/test/unit_tests.ninja @@ -11,5 +11,5 @@ target_output_name = unit_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /SUBSYSTEM$:CONSOLE,5.02 /INCREMENTAL$:NO /DELAYLOAD$:ndfapi.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = comsupp.lib oleacc.lib rpcrt4.lib urlmon.lib winmm.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winspool.lib ws2_32.lib credui.lib netapi32.lib ndfapi.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib esent.lib winhttp.lib ~ output_extension = .exe ~ diff --git a/obj/chrome/tools/convert_dict/convert_dict.ninja b/obj/chrome/tools/convert_dict/convert_dict.ninja index 28a2089..bd69ed7 100644 --- a/obj/chrome/tools/convert_dict/convert_dict.ninja +++ b/obj/chrome/tools/convert_dict/convert_dict.ninja @@ -9,9 +9,12 @@ target_output_name = convert_dict ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./convert_dict.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -427,7 +430,9 @@ build ./convert_dict.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/chrome/tools/convert_dict/convert_dict.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/tools/convert_dict/lib.ninja b/obj/chrome/tools/convert_dict/lib.ninja index 9dd5895..9c91751 100644 --- a/obj/chrome/tools/convert_dict/lib.ninja +++ b/obj/chrome/tools/convert_dict/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/chrome/tools/convert_dict/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/chrome/tools/convert_dict/lib.inputdeps.stamp: ~ build obj/chrome/tools/convert_dict/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/chrome/tools/crash_service/crash_service.ninja b/obj/chrome/tools/crash_service/crash_service.ninja index 22d4048..5304949 100644 --- a/obj/chrome/tools/crash_service/crash_service.ninja +++ b/obj/chrome/tools/crash_service/crash_service.ninja @@ -9,9 +9,12 @@ target_output_name = crash_service ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./crash_service.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -880,7 +883,9 @@ build ./crash_service.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome/tools/crash_service/crash_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome/utility/utility.ninja b/obj/chrome/utility/utility.ninja index 071fae6..36fe2b0 100644 --- a/obj/chrome/utility/utility.ninja +++ b/obj/chrome/utility/utility.ninja @@ -11,8 +11,9 @@ target_output_name = utility ~ ~ ldflags = /DELAYLOAD$:wininet.dll /DELAYLOAD$:esent.dll /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = esent.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib advapi32.lib gdi32.lib user32.lib ~ output_extension = .lib ~ build obj/chrome/utility/utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -241,4 +242,6 @@ build obj/chrome/utility/utility.lib: ./libexif.dll ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -761,4 +764,5 @@ build obj/chrome/utility/utility.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome_elf/blacklist.ninja b/obj/chrome_elf/blacklist.ninja index 623ffdd..7b2a250 100644 --- a/obj/chrome_elf/blacklist.ninja +++ b/obj/chrome_elf/blacklist.ninja @@ -9,8 +9,9 @@ target_output_name = blacklist ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/chrome_elf/blacklist.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/chrome_elf/blacklist.inputdeps.stamp: build obj/chrome_elf/blacklist.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -34,4 +37,5 @@ build obj/chrome_elf/blacklist.lib: obj/sandbox/win/sandbox.lib ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/chrome_elf/blacklist_test_main_dll.ninja b/obj/chrome_elf/blacklist_test_main_dll.ninja index 2c7aea4..3781bde 100644 --- a/obj/chrome_elf/blacklist_test_main_dll.ninja +++ b/obj/chrome_elf/blacklist_test_main_dll.ninja @@ -9,8 +9,11 @@ target_output_name = blacklist_test_main_dll ~ ~ ldflags = /DEF$:../chrome_elf/blacklist/test/blacklist_test_main_dll.def /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./blacklist_test_main_dll.dll ./blacklist_test_main_dll.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -39,7 +42,9 @@ build ./blacklist_test_main_dll.dll ./blacklist_test_main_dll.dll.lib: obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ solink ~ +| ~ || ~ ~ build obj/chrome_elf/blacklist_test_main_dll.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome_elf/breakpad.ninja b/obj/chrome_elf/breakpad.ninja index f9b0d69..6042ecf 100644 --- a/obj/chrome_elf/breakpad.ninja +++ b/obj/chrome_elf/breakpad.ninja @@ -10,4 +10,5 @@ target_output_name = breakpad ~ build obj/chrome_elf/breakpad.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/chrome_elf/breakpad.inputdeps.stamp: ~ build obj/chrome_elf/breakpad.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome_elf/chrome_elf.ninja b/obj/chrome_elf/chrome_elf.ninja index 5f34e76..012c06c 100644 --- a/obj/chrome_elf/chrome_elf.ninja +++ b/obj/chrome_elf/chrome_elf.ninja @@ -9,8 +9,11 @@ target_output_name = chrome_elf ~ ~ ldflags = /NODEFAULTLIB$:user32.lib /DEF$:D$:/chrome/src/chrome_elf/chrome_elf.def /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./chrome_elf.dll ./chrome_elf.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -43,7 +46,9 @@ build ./chrome_elf.dll ./chrome_elf.dll.lib: obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ solink ~ +| ~ || ~ ~ build obj/chrome_elf/chrome_elf.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome_elf/chrome_elf_unittests.ninja b/obj/chrome_elf/chrome_elf_unittests.ninja index e9ed08e..2f963f5 100644 --- a/obj/chrome_elf/chrome_elf_unittests.ninja +++ b/obj/chrome_elf/chrome_elf_unittests.ninja @@ -9,6 +9,6 @@ target_output_name = chrome_elf_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./chrome_elf_unittests.exe: ~ @@ -18,5 +18,8 @@ build ./chrome_elf_unittests.exe: ./blacklist_test_main_dll.dll.lib ~ ./chrome_elf.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -486,7 +489,9 @@ build ./chrome_elf_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/chrome_elf/chrome_elf_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/chrome_elf/common.ninja b/obj/chrome_elf/common.ninja index c3346c1..403af28 100644 --- a/obj/chrome_elf/common.ninja +++ b/obj/chrome_elf/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/chrome_elf/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome_elf/common.inputdeps.stamp: ~ build obj/chrome_elf/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome_elf/dll_hash.ninja b/obj/chrome_elf/dll_hash.ninja index 02d0ea4..b263faa 100644 --- a/obj/chrome_elf/dll_hash.ninja +++ b/obj/chrome_elf/dll_hash.ninja @@ -10,4 +10,5 @@ target_output_name = dll_hash ~ build obj/chrome_elf/dll_hash.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/chrome_elf/dll_hash.inputdeps.stamp: ~ build obj/chrome_elf/dll_hash.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/chrome_elf/dll_hash_main.ninja b/obj/chrome_elf/dll_hash_main.ninja index ad48ab0..6a0730c 100644 --- a/obj/chrome_elf/dll_hash_main.ninja +++ b/obj/chrome_elf/dll_hash_main.ninja @@ -9,9 +9,12 @@ target_output_name = dll_hash_main ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./dll_hash_main.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -24,7 +27,9 @@ build ./dll_hash_main.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/chrome_elf/dll_hash_main.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/cloud_print_unittests.ninja b/obj/cloud_print/cloud_print_unittests.ninja index 02db58f..5f9f9dc 100644 --- a/obj/cloud_print/cloud_print_unittests.ninja +++ b/obj/cloud_print/cloud_print_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = cloud_print_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = secur32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cloud_print_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3644,7 +3647,9 @@ build ./cloud_print_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cloud_print/cloud_print_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/common/common.ninja b/obj/cloud_print/common/common.ninja index 0a67318..7aa8642 100644 --- a/obj/cloud_print/common/common.ninja +++ b/obj/cloud_print/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/cloud_print/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/cloud_print/common/common.inputdeps.stamp: ~ build obj/cloud_print/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/cloud_print/common/install_utils.ninja b/obj/cloud_print/common/install_utils.ninja index b166b27..1b7e590 100644 --- a/obj/cloud_print/common/install_utils.ninja +++ b/obj/cloud_print/common/install_utils.ninja @@ -10,4 +10,5 @@ target_output_name = install_utils ~ build obj/cloud_print/common/install_utils.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/cloud_print/common/install_utils.inputdeps.stamp: ~ build obj/cloud_print/common/install_utils.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/cloud_print/service/lib.ninja b/obj/cloud_print/service/lib.ninja index cb37cdf..5d57396 100644 --- a/obj/cloud_print/service/lib.ninja +++ b/obj/cloud_print/service/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/cloud_print/service/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/cloud_print/service/lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/cloud_print/service/win/cloud_print_service.ninja b/obj/cloud_print/service/win/cloud_print_service.ninja index e8f8483..cb03c55 100644 --- a/obj/cloud_print/service/win/cloud_print_service.ninja +++ b/obj/cloud_print/service/win/cloud_print_service.ninja @@ -9,11 +9,14 @@ target_output_name = cloud_print_service ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = secur32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cloud_print_service.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3590,7 +3593,9 @@ build ./cloud_print_service.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cloud_print/service/win/cloud_print_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/service/win/cloud_print_service_config.ninja b/obj/cloud_print/service/win/cloud_print_service_config.ninja index e472dc7..60d5868 100644 --- a/obj/cloud_print/service/win/cloud_print_service_config.ninja +++ b/obj/cloud_print/service/win/cloud_print_service_config.ninja @@ -9,11 +9,14 @@ target_output_name = cloud_print_service_config ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = secur32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cloud_print_service_config.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3592,7 +3595,9 @@ build ./cloud_print_service_config.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cloud_print/service/win/cloud_print_service_config.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/service/win/cloud_print_service_setup.ninja b/obj/cloud_print/service/win/cloud_print_service_setup.ninja index aab6f55..00ffad0 100644 --- a/obj/cloud_print/service/win/cloud_print_service_setup.ninja +++ b/obj/cloud_print/service/win/cloud_print_service_setup.ninja @@ -9,11 +9,14 @@ target_output_name = cloud_print_service_setup ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = secur32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./cloud_print_service_setup.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3590,7 +3593,9 @@ build ./cloud_print_service_setup.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/cloud_print/service/win/cloud_print_service_setup.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/virtual_driver/win/install/virtual_driver_setup.ninja b/obj/cloud_print/virtual_driver/win/install/virtual_driver_setup.ninja index 340aef2..3fd86a3 100644 --- a/obj/cloud_print/virtual_driver/win/install/virtual_driver_setup.ninja +++ b/obj/cloud_print/virtual_driver/win/install/virtual_driver_setup.ninja @@ -9,9 +9,12 @@ target_output_name = virtual_driver_setup ~ ~ ldflags = /DELAYLOAD$:winspool.drv /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = setupapi.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib ~ output_extension = .exe ~ build ./virtual_driver_setup.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -84,7 +87,9 @@ build ./virtual_driver_setup.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/cloud_print/virtual_driver/win/install/virtual_driver_setup.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/virtual_driver/win/port_monitor/lib.ninja b/obj/cloud_print/virtual_driver/win/port_monitor/lib.ninja index 3cb14c5..00f2433 100644 --- a/obj/cloud_print/virtual_driver/win/port_monitor/lib.ninja +++ b/obj/cloud_print/virtual_driver/win/port_monitor/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/cloud_print/virtual_driver/win/port_monitor/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/cloud_print/virtual_driver/win/port_monitor/lib.inputdeps.stamp: ~ build obj/cloud_print/virtual_driver/win/port_monitor/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.ninja b/obj/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.ninja index 3e7d268..8e74d99 100644 --- a/obj/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.ninja +++ b/obj/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.ninja @@ -9,9 +9,12 @@ target_output_name = gcp_portmon ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" /DEF:../cloud_print/virtual_driver/win/port_monitor/port_monitor.def ~ libs = userenv.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./gcp_portmon.dll ./gcp_portmon.dll.lib: ~ ../cloud_print/virtual_driver/win/port_monitor/port_monitor.def ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -45,4 +48,5 @@ build ./gcp_portmon.dll ./gcp_portmon.dll.lib: ~ build obj/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/cloud_print/virtual_driver/win/win.ninja b/obj/cloud_print/virtual_driver/win/win.ninja index c21a412..68cd1f9 100644 --- a/obj/cloud_print/virtual_driver/win/win.ninja +++ b/obj/cloud_print/virtual_driver/win/win.ninja @@ -10,4 +10,5 @@ target_output_name = win ~ build obj/cloud_print/virtual_driver/win/win.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/cloud_print/virtual_driver/win/win.inputdeps.stamp: ~ build obj/cloud_print/virtual_driver/win/win.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/about_handler/about_handler.ninja b/obj/components/about_handler/about_handler.ninja index 04ff4dd..f8281dd 100644 --- a/obj/components/about_handler/about_handler.ninja +++ b/obj/components/about_handler/about_handler.ninja @@ -10,4 +10,5 @@ target_output_name = about_handler ~ build obj/components/about_handler/about_handler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/about_handler/about_handler.inputdeps.stamp: ~ build obj/components/about_handler/about_handler.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/app_modal/app_modal.ninja b/obj/components/app_modal/app_modal.ninja index 4c83ba1..1097aa2 100644 --- a/obj/components/app_modal/app_modal.ninja +++ b/obj/components/app_modal/app_modal.ninja @@ -9,8 +9,9 @@ target_output_name = app_modal ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/app_modal/app_modal.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -181,4 +182,6 @@ build obj/components/app_modal/app_modal.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -500,4 +503,5 @@ build obj/components/app_modal/app_modal.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/audio_modem/audio_modem.ninja b/obj/components/audio_modem/audio_modem.ninja index 930db1a..8ddad06 100644 --- a/obj/components/audio_modem/audio_modem.ninja +++ b/obj/components/audio_modem/audio_modem.ninja @@ -10,4 +10,5 @@ target_output_name = audio_modem ~ build obj/components/audio_modem/audio_modem.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/audio_modem/audio_modem.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/audio_modem/test_support.ninja b/obj/components/audio_modem/test_support.ninja index 3e81ee1..19398a2 100644 --- a/obj/components/audio_modem/test_support.ninja +++ b/obj/components/audio_modem/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/audio_modem/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/audio_modem/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/auto_login_parser/auto_login_parser.ninja b/obj/components/auto_login_parser/auto_login_parser.ninja index a5722dc..9bbb57b 100644 --- a/obj/components/auto_login_parser/auto_login_parser.ninja +++ b/obj/components/auto_login_parser/auto_login_parser.ninja @@ -10,4 +10,5 @@ target_output_name = auto_login_parser ~ build obj/components/auto_login_parser/auto_login_parser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/auto_login_parser/auto_login_parser.inputdeps.stamp: ~ build obj/components/auto_login_parser/auto_login_parser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/auto_login_parser/unit_tests.ninja b/obj/components/auto_login_parser/unit_tests.ninja index 36ddb0a..98b7299 100644 --- a/obj/components/auto_login_parser/unit_tests.ninja +++ b/obj/components/auto_login_parser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/auto_login_parser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/auto_login_parser/unit_tests.inputdeps.stamp: ~ build obj/components/auto_login_parser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/autofill/content/browser/browser.ninja b/obj/components/autofill/content/browser/browser.ninja index 9586b83..ada22c5 100644 --- a/obj/components/autofill/content/browser/browser.ninja +++ b/obj/components/autofill/content/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/components/autofill/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -198,4 +199,6 @@ build obj/components/autofill/content/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -580,4 +583,5 @@ build obj/components/autofill/content/browser/browser.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/autofill/content/browser/wallet/test_support.ninja b/obj/components/autofill/content/browser/wallet/test_support.ninja index 07fcafa..b5553e2 100644 --- a/obj/components/autofill/content/browser/wallet/test_support.ninja +++ b/obj/components/autofill/content/browser/wallet/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/autofill/content/browser/wallet/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -194,4 +195,5 @@ build obj/components/autofill/content/browser/wallet/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/autofill/content/common/common.ninja b/obj/components/autofill/content/common/common.ninja index d4a861e..9e1bc83 100644 --- a/obj/components/autofill/content/common/common.ninja +++ b/obj/components/autofill/content/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/autofill/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,6 @@ build obj/components/autofill/content/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -376,4 +379,5 @@ build obj/components/autofill/content/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/autofill/content/renderer/renderer.ninja b/obj/components/autofill/content/renderer/renderer.ninja index e80c050..3d7d4b1 100644 --- a/obj/components/autofill/content/renderer/renderer.ninja +++ b/obj/components/autofill/content/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/autofill/content/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/autofill/core/browser/browser.ninja b/obj/components/autofill/core/browser/browser.ninja index 047dc30..034d10f 100644 --- a/obj/components/autofill/core/browser/browser.ninja +++ b/obj/components/autofill/core/browser/browser.ninja @@ -12,4 +12,5 @@ target_output_name = browser ~ build obj/components/autofill/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -75,4 +76,5 @@ build obj/components/autofill/core/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/autofill/core/browser/test_support.ninja b/obj/components/autofill/core/browser/test_support.ninja index 41bb215..c5775c0 100644 --- a/obj/components/autofill/core/browser/test_support.ninja +++ b/obj/components/autofill/core/browser/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/autofill/core/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -83,4 +84,5 @@ build obj/components/autofill/core/browser/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/autofill/core/browser/unit_tests.ninja b/obj/components/autofill/core/browser/unit_tests.ninja index 931f97c..12aacf5 100644 --- a/obj/components/autofill/core/browser/unit_tests.ninja +++ b/obj/components/autofill/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/autofill/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -85,4 +86,5 @@ build obj/components/autofill/core/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/autofill/core/common/common.ninja b/obj/components/autofill/core/common/common.ninja index 27fe9fe..7e97dae 100644 --- a/obj/components/autofill/core/common/common.ninja +++ b/obj/components/autofill/core/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/autofill/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/components/autofill/core/common/common.inputdeps.stamp: build obj/components/autofill/core/common/common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -44,4 +47,5 @@ build obj/components/autofill/core/common/common.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/autofill/core/common/unit_tests.ninja b/obj/components/autofill/core/common/unit_tests.ninja index 1a1e238..ac1eabb 100644 --- a/obj/components/autofill/core/common/unit_tests.ninja +++ b/obj/components/autofill/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/autofill/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -73,4 +74,5 @@ build obj/components/autofill/core/common/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bitmap_uploader/bitmap_uploader.ninja b/obj/components/bitmap_uploader/bitmap_uploader.ninja index 590e258..fe711aa 100644 --- a/obj/components/bitmap_uploader/bitmap_uploader.ninja +++ b/obj/components/bitmap_uploader/bitmap_uploader.ninja @@ -10,4 +10,5 @@ target_output_name = bitmap_uploader ~ build obj/components/bitmap_uploader/bitmap_uploader.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/bitmap_uploader/bitmap_uploader.inputdeps.stamp: ~ build obj/components/bitmap_uploader/bitmap_uploader.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bookmarks/browser/browser.ninja b/obj/components/bookmarks/browser/browser.ninja index fba7a49..4e92ef0 100644 --- a/obj/components/bookmarks/browser/browser.ninja +++ b/obj/components/bookmarks/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/bookmarks/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/bookmarks/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bookmarks/browser/unit_tests.ninja b/obj/components/bookmarks/browser/unit_tests.ninja index 1c33fc9..bbbf292 100644 --- a/obj/components/bookmarks/browser/unit_tests.ninja +++ b/obj/components/bookmarks/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/bookmarks/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/bookmarks/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bookmarks/common/common.ninja b/obj/components/bookmarks/common/common.ninja index 3bd9df6..1976157 100644 --- a/obj/components/bookmarks/common/common.ninja +++ b/obj/components/bookmarks/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/bookmarks/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/bookmarks/common/common.inputdeps.stamp: ~ build obj/components/bookmarks/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/bookmarks/managed/managed.ninja b/obj/components/bookmarks/managed/managed.ninja index e6b2174..1282ea7 100644 --- a/obj/components/bookmarks/managed/managed.ninja +++ b/obj/components/bookmarks/managed/managed.ninja @@ -10,4 +10,5 @@ target_output_name = managed ~ build obj/components/bookmarks/managed/managed.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/bookmarks/managed/managed.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bookmarks/managed/unit_tests.ninja b/obj/components/bookmarks/managed/unit_tests.ninja index c17302e..e1b7127 100644 --- a/obj/components/bookmarks/managed/unit_tests.ninja +++ b/obj/components/bookmarks/managed/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/bookmarks/managed/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/bookmarks/managed/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/bookmarks/test/test.ninja b/obj/components/bookmarks/test/test.ninja index d0598f0..271e3ce 100644 --- a/obj/components/bookmarks/test/test.ninja +++ b/obj/components/bookmarks/test/test.ninja @@ -10,4 +10,5 @@ target_output_name = test ~ build obj/components/bookmarks/test/test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/bookmarks/test/test.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browser_sync/browser/browser.ninja b/obj/components/browser_sync/browser/browser.ninja index 7e1d8f4..b6d9d69 100644 --- a/obj/components/browser_sync/browser/browser.ninja +++ b/obj/components/browser_sync/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/browser_sync/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -198,4 +199,5 @@ build obj/components/browser_sync/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browser_sync/browser/test_support.ninja b/obj/components/browser_sync/browser/test_support.ninja index 79e3174..cb896a0 100644 --- a/obj/components/browser_sync/browser/test_support.ninja +++ b/obj/components/browser_sync/browser/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/browser_sync/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -198,4 +199,5 @@ build obj/components/browser_sync/browser/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browser_sync/browser/unit_tests.ninja b/obj/components/browser_sync/browser/unit_tests.ninja index 858d17f..106202d 100644 --- a/obj/components/browser_sync/browser/unit_tests.ninja +++ b/obj/components/browser_sync/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/browser_sync/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -201,4 +202,5 @@ build obj/components/browser_sync/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browser_sync/common/common.ninja b/obj/components/browser_sync/common/common.ninja index 6073a8c..599297f 100644 --- a/obj/components/browser_sync/common/common.ninja +++ b/obj/components/browser_sync/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/browser_sync/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/browser_sync/common/common.inputdeps.stamp: ~ build obj/components/browser_sync/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/browser_watcher/browser_watcher.ninja b/obj/components/browser_watcher/browser_watcher.ninja index c1ad1dd..6d66e63 100644 --- a/obj/components/browser_watcher/browser_watcher.ninja +++ b/obj/components/browser_watcher/browser_watcher.ninja @@ -10,4 +10,5 @@ target_output_name = browser_watcher ~ build obj/components/browser_watcher/browser_watcher.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/browser_watcher/browser_watcher.inputdeps.stamp: ~ build obj/components/browser_watcher/browser_watcher.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/browser_watcher/browser_watcher_client.ninja b/obj/components/browser_watcher/browser_watcher_client.ninja index af8cbe2..ca0350f 100644 --- a/obj/components/browser_watcher/browser_watcher_client.ninja +++ b/obj/components/browser_watcher/browser_watcher_client.ninja @@ -10,4 +10,5 @@ target_output_name = browser_watcher_client ~ build obj/components/browser_watcher/browser_watcher_client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/components/browser_watcher/browser_watcher_client.inputdeps.stamp: ~ build obj/components/browser_watcher/browser_watcher_client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browser_watcher/unit_tests.ninja b/obj/components/browser_watcher/unit_tests.ninja index 86d4dc7..6040efc 100644 --- a/obj/components/browser_watcher/unit_tests.ninja +++ b/obj/components/browser_watcher/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/browser_watcher/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/components/browser_watcher/unit_tests.inputdeps.stamp: ~ build obj/components/browser_watcher/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/browsing_data/browsing_data.ninja b/obj/components/browsing_data/browsing_data.ninja index e50cb56..8cdf322 100644 --- a/obj/components/browsing_data/browsing_data.ninja +++ b/obj/components/browsing_data/browsing_data.ninja @@ -9,8 +9,9 @@ target_output_name = browsing_data ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/browsing_data/browsing_data.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/components/browsing_data/browsing_data.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -483,4 +486,5 @@ build obj/components/browsing_data/browsing_data.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/bubble/bubble.ninja b/obj/components/bubble/bubble.ninja index ccfe5a7..0665001 100644 --- a/obj/components/bubble/bubble.ninja +++ b/obj/components/bubble/bubble.ninja @@ -10,4 +10,5 @@ target_output_name = bubble ~ build obj/components/bubble/bubble.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/bubble/bubble.inputdeps.stamp: ~ build obj/components/bubble/bubble.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/bubble/test_support.ninja b/obj/components/bubble/test_support.ninja index 3654e49..c8429c7 100644 --- a/obj/components/bubble/test_support.ninja +++ b/obj/components/bubble/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/bubble/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/bubble/test_support.inputdeps.stamp: ~ build obj/components/bubble/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/bubble/unit_tests.ninja b/obj/components/bubble/unit_tests.ninja index 106592e..b3eaeb0 100644 --- a/obj/components/bubble/unit_tests.ninja +++ b/obj/components/bubble/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/bubble/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/bubble/unit_tests.inputdeps.stamp: ~ build obj/components/bubble/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/captive_portal/captive_portal.ninja b/obj/components/captive_portal/captive_portal.ninja index 09fca87..6083053 100644 --- a/obj/components/captive_portal/captive_portal.ninja +++ b/obj/components/captive_portal/captive_portal.ninja @@ -10,4 +10,5 @@ target_output_name = captive_portal ~ build obj/components/captive_portal/captive_portal.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/captive_portal/captive_portal.inputdeps.stamp: ~ build obj/components/captive_portal/captive_portal.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/captive_portal/test_support.ninja b/obj/components/captive_portal/test_support.ninja index 9d33207..d5cd6f0 100644 --- a/obj/components/captive_portal/test_support.ninja +++ b/obj/components/captive_portal/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/captive_portal/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/captive_portal/test_support.inputdeps.stamp: ~ build obj/components/captive_portal/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/captive_portal/unit_tests.ninja b/obj/components/captive_portal/unit_tests.ninja index 3b062b5..ae5297d 100644 --- a/obj/components/captive_portal/unit_tests.ninja +++ b/obj/components/captive_portal/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/captive_portal/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/captive_portal/unit_tests.inputdeps.stamp: ~ build obj/components/captive_portal/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/cdm/common/common.ninja b/obj/components/cdm/common/common.ninja index a30d4c7..ffb690a 100644 --- a/obj/components/cdm/common/common.ninja +++ b/obj/components/cdm/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/cdm/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/cdm/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/cdm/renderer/renderer.ninja b/obj/components/cdm/renderer/renderer.ninja index 74fc095..c624577 100644 --- a/obj/components/cdm/renderer/renderer.ninja +++ b/obj/components/cdm/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/cdm/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/certificate_reporting/certificate_reporting.ninja b/obj/components/certificate_reporting/certificate_reporting.ninja index ca126b0..dc7375f 100644 --- a/obj/components/certificate_reporting/certificate_reporting.ninja +++ b/obj/components/certificate_reporting/certificate_reporting.ninja @@ -9,8 +9,9 @@ target_output_name = certificate_reporting ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/certificate_reporting/certificate_reporting.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/components/certificate_reporting/certificate_reporting.inputdeps.stamp build obj/components/certificate_reporting/certificate_reporting.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -65,4 +68,5 @@ build obj/components/certificate_reporting/certificate_reporting.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/certificate_reporting/unit_tests.ninja b/obj/components/certificate_reporting/unit_tests.ninja index 11256dd..4fa2216 100644 --- a/obj/components/certificate_reporting/unit_tests.ninja +++ b/obj/components/certificate_reporting/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/certificate_reporting/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,5 @@ build obj/components/certificate_reporting/unit_tests.inputdeps.stamp: ~ build obj/components/certificate_reporting/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/certificate_transparency/certificate_transparency.ninja b/obj/components/certificate_transparency/certificate_transparency.ninja index 719df9e..e6b11b9 100644 --- a/obj/components/certificate_transparency/certificate_transparency.ninja +++ b/obj/components/certificate_transparency/certificate_transparency.ninja @@ -10,4 +10,5 @@ target_output_name = certificate_transparency ~ build obj/components/certificate_transparency/certificate_transparency.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/certificate_transparency/certificate_transparency.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/certificate_transparency/unit_tests.ninja b/obj/components/certificate_transparency/unit_tests.ninja index 50332f7..1deeaae 100644 --- a/obj/components/certificate_transparency/unit_tests.ninja +++ b/obj/components/certificate_transparency/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/certificate_transparency/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -180,4 +181,5 @@ build obj/components/certificate_transparency/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/clipboard/apptests.ninja b/obj/components/clipboard/apptests.ninja index 75e1132..5440058 100644 --- a/obj/components/clipboard/apptests.ninja +++ b/obj/components/clipboard/apptests.ninja @@ -7,4 +7,5 @@ build clipboard_apptests/clipboard_apptests.mojo: ~ build obj/components/clipboard/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/clipboard/clipboard.ninja b/obj/components/clipboard/clipboard.ninja index 769d68a..f8319c5 100644 --- a/obj/components/clipboard/clipboard.ninja +++ b/obj/components/clipboard/clipboard.ninja @@ -7,4 +7,5 @@ build clipboard/clipboard.mojo: ~ build obj/components/clipboard/clipboard.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/clipboard/clipboard_apptests_library.ninja b/obj/components/clipboard/clipboard_apptests_library.ninja index d287ea1..b042ece 100644 --- a/obj/components/clipboard/clipboard_apptests_library.ninja +++ b/obj/components/clipboard/clipboard_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = clipboard_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./clipboard_apptests_library.dll ./clipboard_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -595,7 +598,9 @@ build ./clipboard_apptests_library.dll ./clipboard_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/clipboard/clipboard_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/clipboard/clipboard_library.ninja b/obj/components/clipboard/clipboard_library.ninja index 80a6564..8ec266b 100644 --- a/obj/components/clipboard/clipboard_library.ninja +++ b/obj/components/clipboard/clipboard_library.ninja @@ -9,9 +9,12 @@ target_output_name = clipboard_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./clipboard_library.dll ./clipboard_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -549,7 +552,9 @@ build ./clipboard_library.dll ./clipboard_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/clipboard/clipboard_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/clipboard/lib.ninja b/obj/components/clipboard/lib.ninja index fb5eaf0..5a1cd08 100644 --- a/obj/components/clipboard/lib.ninja +++ b/obj/components/clipboard/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/clipboard/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,5 @@ build obj/components/clipboard/lib.inputdeps.stamp: ~ build obj/components/clipboard/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/clipboard/public/interfaces/interfaces.ninja b/obj/components/clipboard/public/interfaces/interfaces.ninja index c2351d3..00e0467 100644 --- a/obj/components/clipboard/public/interfaces/interfaces.ninja +++ b/obj/components/clipboard/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/clipboard/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/clipboard/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/clipboard/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/clipboard/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/clipboard/public/interfaces/interfaces_cpp_sources.ninja index 8e32594..033bce4 100644 --- a/obj/components/clipboard/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/clipboard/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/clipboard/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/clipboard/public/interfaces/interfaces_cpp_sources.inputdep ~ build obj/components/clipboard/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/cloud_devices/common/common.ninja b/obj/components/cloud_devices/common/common.ninja index 785d3ef..eefdb6f 100644 --- a/obj/components/cloud_devices/common/common.ninja +++ b/obj/components/cloud_devices/common/common.ninja @@ -9,9 +9,11 @@ target_output_name = cloud_devices_common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/cloud_devices/common/cloud_devices_common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -42,7 +44,9 @@ build obj/components/cloud_devices/common/cloud_devices_common.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/components/cloud_devices/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/cloud_devices/common/unit_tests.ninja b/obj/components/cloud_devices/common/unit_tests.ninja index 0e6587d..835b32b 100644 --- a/obj/components/cloud_devices/common/unit_tests.ninja +++ b/obj/components/cloud_devices/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/cloud_devices/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/cloud_devices/common/unit_tests.inputdeps.stamp: ~ build obj/components/cloud_devices/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/component_updater/component_updater.ninja b/obj/components/component_updater/component_updater.ninja index cefece6..d8eefc3 100644 --- a/obj/components/component_updater/component_updater.ninja +++ b/obj/components/component_updater/component_updater.ninja @@ -10,4 +10,5 @@ target_output_name = component_updater ~ build obj/components/component_updater/component_updater.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/components/component_updater/component_updater.inputdeps.stamp: ~ build obj/components/component_updater/component_updater.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/component_updater/test_support.ninja b/obj/components/component_updater/test_support.ninja index cb839a4..db0119e 100644 --- a/obj/components/component_updater/test_support.ninja +++ b/obj/components/component_updater/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/component_updater/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/components/component_updater/test_support.inputdeps.stamp: ~ build obj/components/component_updater/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/component_updater/unit_tests.ninja b/obj/components/component_updater/unit_tests.ninja index b00473d..7a6d2c8 100644 --- a/obj/components/component_updater/unit_tests.ninja +++ b/obj/components/component_updater/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/component_updater/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/component_updater/unit_tests.inputdeps.stamp: ~ build obj/components/component_updater/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/components_browsertests.ninja b/obj/components/components_browsertests.ninja index 49fb29d..621a088 100644 --- a/obj/components/components_browsertests.ninja +++ b/obj/components/components_browsertests.ninja @@ -9,6 +9,6 @@ target_output_name = components_browsertests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .exe ~ build ./components_browsertests.exe: ~ diff --git a/obj/components/components_perftests.ninja b/obj/components/components_perftests.ninja index 8e5c8b5..9e5fc65 100644 --- a/obj/components/components_perftests.ninja +++ b/obj/components/components_perftests.ninja @@ -9,6 +9,6 @@ target_output_name = components_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .exe ~ build ./components_perftests.exe: ~ diff --git a/obj/components/components_unittests.ninja b/obj/components/components_unittests.ninja index 486ad70..38f76e4 100644 --- a/obj/components/components_unittests.ninja +++ b/obj/components/components_unittests.ninja @@ -9,6 +9,6 @@ target_output_name = components_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .exe ~ build ./components_unittests.exe: ~ diff --git a/obj/components/compression/compression.ninja b/obj/components/compression/compression.ninja index 6236dca..814a000 100644 --- a/obj/components/compression/compression.ninja +++ b/obj/components/compression/compression.ninja @@ -10,4 +10,5 @@ target_output_name = compression ~ build obj/components/compression/compression.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/compression/compression.inputdeps.stamp: ~ build obj/components/compression/compression.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/compression/unit_tests.ninja b/obj/components/compression/unit_tests.ninja index 7461a77..5510eb6 100644 --- a/obj/components/compression/unit_tests.ninja +++ b/obj/components/compression/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/compression/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/compression/unit_tests.inputdeps.stamp: ~ build obj/components/compression/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/constrained_window/constrained_window.ninja b/obj/components/constrained_window/constrained_window.ninja index 1682799..81482c3 100644 --- a/obj/components/constrained_window/constrained_window.ninja +++ b/obj/components/constrained_window/constrained_window.ninja @@ -10,4 +10,5 @@ target_output_name = constrained_window ~ build obj/components/constrained_window/constrained_window.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/constrained_window/constrained_window.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/constrained_window/unit_tests.ninja b/obj/components/constrained_window/unit_tests.ninja index 531fe5e..ada9371 100644 --- a/obj/components/constrained_window/unit_tests.ninja +++ b/obj/components/constrained_window/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/constrained_window/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/constrained_window/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/content_settings/content/common/common.ninja b/obj/components/content_settings/content/common/common.ninja index 35237e9..ed36041 100644 --- a/obj/components/content_settings/content/common/common.ninja +++ b/obj/components/content_settings/content/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/content_settings/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/content_settings/content/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/content_settings/core/browser/browser.ninja b/obj/components/content_settings/core/browser/browser.ninja index f43d69f..9fd82ee 100644 --- a/obj/components/content_settings/core/browser/browser.ninja +++ b/obj/components/content_settings/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/content_settings/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/content_settings/core/browser/browser.inputdeps.stamp: ~ build obj/components/content_settings/core/browser/browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/content_settings/core/browser/unit_tests.ninja b/obj/components/content_settings/core/browser/unit_tests.ninja index 23cfa49..f9b98d0 100644 --- a/obj/components/content_settings/core/browser/unit_tests.ninja +++ b/obj/components/content_settings/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/content_settings/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/content_settings/core/browser/unit_tests.inputdeps.stamp: ~ build obj/components/content_settings/core/browser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/content_settings/core/common/common.ninja b/obj/components/content_settings/core/common/common.ninja index 2a62b3c..638955b 100644 --- a/obj/components/content_settings/core/common/common.ninja +++ b/obj/components/content_settings/core/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/content_settings/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/components/content_settings/core/common/common.inputdeps.stamp: build obj/components/content_settings/core/common/common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -63,4 +66,5 @@ build obj/components/content_settings/core/common/common.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/content_settings/core/common/unit_tests.ninja b/obj/components/content_settings/core/common/unit_tests.ninja index b35bdf7..1ef3495 100644 --- a/obj/components/content_settings/core/common/unit_tests.ninja +++ b/obj/components/content_settings/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/content_settings/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/content_settings/core/common/unit_tests.inputdeps.stamp: ~ build obj/components/content_settings/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/content_settings/core/test/test_support.ninja b/obj/components/content_settings/core/test/test_support.ninja index 8a51654..3cae8fc 100644 --- a/obj/components/content_settings/core/test/test_support.ninja +++ b/obj/components/content_settings/core/test/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/content_settings/core/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/components/content_settings/core/test/test_support.inputdeps.stamp: build obj/components/content_settings/core/test/test_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -87,4 +90,5 @@ build obj/components/content_settings/core/test/test_support.lib: obj/ui/gfx/gfx_export.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/contextual_search/browser.ninja b/obj/components/contextual_search/browser.ninja index 46a11df..f80459a 100644 --- a/obj/components/contextual_search/browser.ninja +++ b/obj/components/contextual_search/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/contextual_search/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,6 @@ build obj/components/contextual_search/browser.inputdeps.stamp: build obj/components/contextual_search/browser.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -40,4 +43,5 @@ build obj/components/contextual_search/browser.lib: obj/mojo/public/interfaces/bindings/bindings_cpp_sources.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/contextual_search/mojo_bindings.ninja b/obj/components/contextual_search/mojo_bindings.ninja index 471b88b..08baf83 100644 --- a/obj/components/contextual_search/mojo_bindings.ninja +++ b/obj/components/contextual_search/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/components/contextual_search/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/contextual_search/mojo_bindings.inputdeps.stamp: ~ build obj/components/contextual_search/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/contextual_search/mojo_bindings_cpp_sources.ninja b/obj/components/contextual_search/mojo_bindings_cpp_sources.ninja index 6d496b2..baaaf0b 100644 --- a/obj/components/contextual_search/mojo_bindings_cpp_sources.ninja +++ b/obj/components/contextual_search/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/components/contextual_search/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/contextual_search/mojo_bindings_cpp_sources.inputdeps.stamp ~ build obj/components/contextual_search/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/contextual_search/renderer.ninja b/obj/components/contextual_search/renderer.ninja index deba714..397d43d 100644 --- a/obj/components/contextual_search/renderer.ninja +++ b/obj/components/contextual_search/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/contextual_search/renderer.inputdeps.stamp: ~ diff --git a/obj/components/cookie_config/cookie_config.ninja b/obj/components/cookie_config/cookie_config.ninja index 3b16c90..52ecad9 100644 --- a/obj/components/cookie_config/cookie_config.ninja +++ b/obj/components/cookie_config/cookie_config.ninja @@ -10,4 +10,5 @@ target_output_name = cookie_config ~ build obj/components/cookie_config/cookie_config.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/cookie_config/cookie_config.inputdeps.stamp: ~ build obj/components/cookie_config/cookie_config.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/crash/content/app/app.ninja b/obj/components/crash/content/app/app.ninja index f5816b3..b21fa9c 100644 --- a/obj/components/crash/content/app/app.ninja +++ b/obj/components/crash/content/app/app.ninja @@ -10,4 +10,5 @@ target_output_name = app ~ build obj/components/crash/content/app/app.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/crash/content/app/app.inputdeps.stamp: ~ build obj/components/crash/content/app/app.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.ninja b/obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.ninja index abc12c2..fbd86bf 100644 --- a/obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.ninja +++ b/obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.ninja @@ -10,4 +10,5 @@ target_output_name = app_breakpad_mac_win_to_be_deleted ~ build obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.inputd ~ build obj/components/crash/content/app/app_breakpad_mac_win_to_be_deleted.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/content/app/app_non_mac_win.ninja b/obj/components/crash/content/app/app_non_mac_win.ninja index 7dbdd91..c1f2f14 100644 --- a/obj/components/crash/content/app/app_non_mac_win.ninja +++ b/obj/components/crash/content/app/app_non_mac_win.ninja @@ -10,4 +10,5 @@ target_output_name = app_non_mac_win ~ build obj/components/crash/content/app/app_non_mac_win.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/content/app/app_non_mac_win.inputdeps.stamp: ~ build obj/components/crash/content/app/app_non_mac_win.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/content/app/lib.ninja b/obj/components/crash/content/app/lib.ninja index 98d870a..5b635c3 100644 --- a/obj/components/crash/content/app/lib.ninja +++ b/obj/components/crash/content/app/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/crash/content/app/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/content/app/lib.inputdeps.stamp: ~ build obj/components/crash/content/app/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/content/tools/crash_service.ninja b/obj/components/crash/content/tools/crash_service.ninja index 386414a..72bb5ec 100644 --- a/obj/components/crash/content/tools/crash_service.ninja +++ b/obj/components/crash/content/tools/crash_service.ninja @@ -10,4 +10,5 @@ target_output_name = crash_service ~ build obj/components/crash/content/tools/crash_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/content/tools/crash_service.inputdeps.stamp: ~ build obj/components/crash/content/tools/crash_service.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/core/browser/browser.ninja b/obj/components/crash/core/browser/browser.ninja index d9366c8..5977a40 100644 --- a/obj/components/crash/core/browser/browser.ninja +++ b/obj/components/crash/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/crash/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/components/crash/core/browser/browser.inputdeps.stamp: ~ build obj/components/crash/core/browser/browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/crash/core/common/common.ninja b/obj/components/crash/core/common/common.ninja index dcda4f0..a9ee893 100644 --- a/obj/components/crash/core/common/common.ninja +++ b/obj/components/crash/core/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/crash/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/core/common/common.inputdeps.stamp: ~ build obj/components/crash/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crash/core/common/unit_tests.ninja b/obj/components/crash/core/common/unit_tests.ninja index f270e3c..5e23331 100644 --- a/obj/components/crash/core/common/unit_tests.ninja +++ b/obj/components/crash/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/crash/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/crash/core/common/unit_tests.inputdeps.stamp: ~ build obj/components/crash/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crx_file/crx_file.ninja b/obj/components/crx_file/crx_file.ninja index a560f7b..5094d00 100644 --- a/obj/components/crx_file/crx_file.ninja +++ b/obj/components/crx_file/crx_file.ninja @@ -10,4 +10,5 @@ target_output_name = crx_file ~ build obj/components/crx_file/crx_file.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/crx_file/crx_file.inputdeps.stamp: ~ build obj/components/crx_file/crx_file.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/crx_file/unit_tests.ninja b/obj/components/crx_file/unit_tests.ninja index e7dad5f..fc65ca5 100644 --- a/obj/components/crx_file/unit_tests.ninja +++ b/obj/components/crx_file/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/crx_file/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/crx_file/unit_tests.inputdeps.stamp: ~ build obj/components/crx_file/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/data_reduction_proxy/content/browser/browser.ninja b/obj/components/data_reduction_proxy/content/browser/browser.ninja index fa81ec8..4ed9188 100644 --- a/obj/components/data_reduction_proxy/content/browser/browser.ninja +++ b/obj/components/data_reduction_proxy/content/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/data_reduction_proxy/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/data_reduction_proxy/content/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/content/common/common.ninja b/obj/components/data_reduction_proxy/content/common/common.ninja index ec9ae78..66e7163 100644 --- a/obj/components/data_reduction_proxy/content/common/common.ninja +++ b/obj/components/data_reduction_proxy/content/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/data_reduction_proxy/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,6 @@ build obj/components/data_reduction_proxy/content/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -374,4 +377,5 @@ build obj/components/data_reduction_proxy/content/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/data_reduction_proxy/core/browser/browser.ninja b/obj/components/data_reduction_proxy/core/browser/browser.ninja index c3526da..08cc399 100644 --- a/obj/components/data_reduction_proxy/core/browser/browser.ninja +++ b/obj/components/data_reduction_proxy/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/data_reduction_proxy/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/components/data_reduction_proxy/core/browser/browser.inputdeps.stamp: ~ build obj/components/data_reduction_proxy/core/browser/browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/core/browser/test_support.ninja b/obj/components/data_reduction_proxy/core/browser/test_support.ninja index f4ede1c..6711c33 100644 --- a/obj/components/data_reduction_proxy/core/browser/test_support.ninja +++ b/obj/components/data_reduction_proxy/core/browser/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/data_reduction_proxy/core/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/data_reduction_proxy/core/browser/test_support.inputdeps.st ~ build obj/components/data_reduction_proxy/core/browser/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/core/browser/unit_tests.ninja b/obj/components/data_reduction_proxy/core/browser/unit_tests.ninja index 4a4eb56..0881fe1 100644 --- a/obj/components/data_reduction_proxy/core/browser/unit_tests.ninja +++ b/obj/components/data_reduction_proxy/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/data_reduction_proxy/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/data_reduction_proxy/core/browser/unit_tests.inputdeps.stam ~ build obj/components/data_reduction_proxy/core/browser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/core/common/common.ninja b/obj/components/data_reduction_proxy/core/common/common.ninja index 23086a9..d4f2eec 100644 --- a/obj/components/data_reduction_proxy/core/common/common.ninja +++ b/obj/components/data_reduction_proxy/core/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/data_reduction_proxy/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/components/data_reduction_proxy/core/common/common.inputdeps.stamp: ~ build obj/components/data_reduction_proxy/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/core/common/test_support.ninja b/obj/components/data_reduction_proxy/core/common/test_support.ninja index f691d21..d4adecb 100644 --- a/obj/components/data_reduction_proxy/core/common/test_support.ninja +++ b/obj/components/data_reduction_proxy/core/common/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/data_reduction_proxy/core/common/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/data_reduction_proxy/core/common/test_support.inputdeps.sta ~ build obj/components/data_reduction_proxy/core/common/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_reduction_proxy/core/common/unit_tests.ninja b/obj/components/data_reduction_proxy/core/common/unit_tests.ninja index bcbee9f..575ca53 100644 --- a/obj/components/data_reduction_proxy/core/common/unit_tests.ninja +++ b/obj/components/data_reduction_proxy/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/data_reduction_proxy/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/data_reduction_proxy/core/common/unit_tests.inputdeps.stamp ~ build obj/components/data_reduction_proxy/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_usage/core/core.ninja b/obj/components/data_usage/core/core.ninja index 47ae438..f1a8969 100644 --- a/obj/components/data_usage/core/core.ninja +++ b/obj/components/data_usage/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = core ~ build obj/components/data_usage/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/data_usage/core/core.inputdeps.stamp: ~ build obj/components/data_usage/core/core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_usage/core/unit_tests.ninja b/obj/components/data_usage/core/unit_tests.ninja index bf0eb6e..e3ad9b6 100644 --- a/obj/components/data_usage/core/unit_tests.ninja +++ b/obj/components/data_usage/core/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/data_usage/core/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/data_usage/core/unit_tests.inputdeps.stamp: ~ build obj/components/data_usage/core/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_use_measurement/content/content.ninja b/obj/components/data_use_measurement/content/content.ninja index 69d6aad..aad4b11 100644 --- a/obj/components/data_use_measurement/content/content.ninja +++ b/obj/components/data_use_measurement/content/content.ninja @@ -10,4 +10,5 @@ target_output_name = content ~ build obj/components/data_use_measurement/content/content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/data_use_measurement/content/content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_use_measurement/content/unit_tests.ninja b/obj/components/data_use_measurement/content/unit_tests.ninja index 1c040fd..fb04377 100644 --- a/obj/components/data_use_measurement/content/unit_tests.ninja +++ b/obj/components/data_use_measurement/content/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/data_use_measurement/content/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/data_use_measurement/content/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/data_use_measurement/core/core.ninja b/obj/components/data_use_measurement/core/core.ninja index db1921a..0a5c682 100644 --- a/obj/components/data_use_measurement/core/core.ninja +++ b/obj/components/data_use_measurement/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = core ~ build obj/components/data_use_measurement/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/data_use_measurement/core/core.inputdeps.stamp: ~ build obj/components/data_use_measurement/core/core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/device_event_log/device_event_log.ninja b/obj/components/device_event_log/device_event_log.ninja index 6fd6b44..4662606 100644 --- a/obj/components/device_event_log/device_event_log.ninja +++ b/obj/components/device_event_log/device_event_log.ninja @@ -10,4 +10,5 @@ target_output_name = device_event_log ~ build obj/components/device_event_log/device_event_log.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/device_event_log/device_event_log.inputdeps.stamp: ~ build obj/components/device_event_log/device_event_log.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/device_event_log/unit_tests.ninja b/obj/components/device_event_log/unit_tests.ninja index 39fb294..b2a61ba 100644 --- a/obj/components/device_event_log/unit_tests.ninja +++ b/obj/components/device_event_log/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/device_event_log/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/device_event_log/unit_tests.inputdeps.stamp: ~ build obj/components/device_event_log/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/devtools_discovery/devtools_discovery.ninja b/obj/components/devtools_discovery/devtools_discovery.ninja index c3fb50f..1a1b208 100644 --- a/obj/components/devtools_discovery/devtools_discovery.ninja +++ b/obj/components/devtools_discovery/devtools_discovery.ninja @@ -10,4 +10,5 @@ target_output_name = devtools_discovery ~ build obj/components/devtools_discovery/devtools_discovery.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/devtools_discovery/devtools_discovery.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/devtools_http_handler/devtools_http_handler.ninja b/obj/components/devtools_http_handler/devtools_http_handler.ninja index e24a9dd..b20ced7 100644 --- a/obj/components/devtools_http_handler/devtools_http_handler.ninja +++ b/obj/components/devtools_http_handler/devtools_http_handler.ninja @@ -10,4 +10,5 @@ target_output_name = devtools_http_handler ~ build obj/components/devtools_http_handler/devtools_http_handler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/devtools_http_handler/devtools_http_handler.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/devtools_service/devtools_service.ninja b/obj/components/devtools_service/devtools_service.ninja index a3589af..263ea44 100644 --- a/obj/components/devtools_service/devtools_service.ninja +++ b/obj/components/devtools_service/devtools_service.ninja @@ -7,4 +7,5 @@ build devtools_service/devtools_service.mojo: ~ build obj/components/devtools_service/devtools_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/devtools_service/devtools_service_library.ninja b/obj/components/devtools_service/devtools_service_library.ninja index 7663a95..8d1ead6 100644 --- a/obj/components/devtools_service/devtools_service_library.ninja +++ b/obj/components/devtools_service/devtools_service_library.ninja @@ -9,8 +9,11 @@ target_output_name = devtools_service_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./devtools_service_library.dll ./devtools_service_library.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -548,7 +551,9 @@ build ./devtools_service_library.dll ./devtools_service_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/devtools_service/devtools_service_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/devtools_service/lib.ninja b/obj/components/devtools_service/lib.ninja index 694fd3c..ab90129 100644 --- a/obj/components/devtools_service/lib.ninja +++ b/obj/components/devtools_service/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/devtools_service/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/components/devtools_service/lib.inputdeps.stamp: ~ build obj/components/devtools_service/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/devtools_service/public/interfaces/interfaces.ninja b/obj/components/devtools_service/public/interfaces/interfaces.ninja index 3eef1ff..72821b0 100644 --- a/obj/components/devtools_service/public/interfaces/interfaces.ninja +++ b/obj/components/devtools_service/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/devtools_service/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/devtools_service/public/interfaces/interfaces.inputdeps.sta ~ build obj/components/devtools_service/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.ninja index 85a5bb1..af350bf 100644 --- a/obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.i ~ build obj/components/devtools_service/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/dom_distiller/content/browser/browser.ninja b/obj/components/dom_distiller/content/browser/browser.ninja index 390c866..068696f 100644 --- a/obj/components/dom_distiller/content/browser/browser.ninja +++ b/obj/components/dom_distiller/content/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib comctl32.lib dinput8.lib dxguid.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/dom_distiller/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -190,4 +191,6 @@ build obj/components/dom_distiller/content/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -528,4 +531,5 @@ build obj/components/dom_distiller/content/browser/browser.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/dom_distiller/content/common/common.ninja b/obj/components/dom_distiller/content/common/common.ninja index 7bcf1ac..1b64664 100644 --- a/obj/components/dom_distiller/content/common/common.ninja +++ b/obj/components/dom_distiller/content/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/dom_distiller/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/dom_distiller/content/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/dom_distiller/content/common/mojo_bindings.ninja b/obj/components/dom_distiller/content/common/mojo_bindings.ninja index 3c55a37..911c3ce 100644 --- a/obj/components/dom_distiller/content/common/mojo_bindings.ninja +++ b/obj/components/dom_distiller/content/common/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/components/dom_distiller/content/common/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/dom_distiller/content/common/mojo_bindings.inputdeps.stamp: ~ build obj/components/dom_distiller/content/common/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.ninja b/obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.ninja index 6ff0009..3304e64 100644 --- a/obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.ninja +++ b/obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.inpu ~ build obj/components/dom_distiller/content/common/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/dom_distiller/content/renderer/renderer.ninja b/obj/components/dom_distiller/content/renderer/renderer.ninja index 8d1331f..8c21f9a 100644 --- a/obj/components/dom_distiller/content/renderer/renderer.ninja +++ b/obj/components/dom_distiller/content/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/dom_distiller/content/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/dom_distiller/core/core.ninja b/obj/components/dom_distiller/core/core.ninja index 2a2b43c..4c3f3e6 100644 --- a/obj/components/dom_distiller/core/core.ninja +++ b/obj/components/dom_distiller/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = core ~ build obj/components/dom_distiller/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/dom_distiller/core/core.inputdeps.stamp: ~ build obj/components/dom_distiller/core/core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/dom_distiller/core/test_support.ninja b/obj/components/dom_distiller/core/test_support.ninja index 6ffbf6a..b1f09fb 100644 --- a/obj/components/dom_distiller/core/test_support.ninja +++ b/obj/components/dom_distiller/core/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/dom_distiller/core/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -53,4 +54,5 @@ build obj/components/dom_distiller/core/test_support.inputdeps.stamp: ~ build obj/components/dom_distiller/core/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/dom_distiller/core/unit_tests.ninja b/obj/components/dom_distiller/core/unit_tests.ninja index 7594895..189dd1e 100644 --- a/obj/components/dom_distiller/core/unit_tests.ninja +++ b/obj/components/dom_distiller/core/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/dom_distiller/core/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -63,4 +64,5 @@ build obj/components/dom_distiller/core/unit_tests.inputdeps.stamp: ~ build obj/components/dom_distiller/core/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/dom_distiller/webui/webui.ninja b/obj/components/dom_distiller/webui/webui.ninja index e7ad5a7..273a68d 100644 --- a/obj/components/dom_distiller/webui/webui.ninja +++ b/obj/components/dom_distiller/webui/webui.ninja @@ -9,8 +9,9 @@ target_output_name = webui ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib comctl32.lib dinput8.lib dxguid.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/dom_distiller/webui/webui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -189,4 +190,6 @@ build obj/components/dom_distiller/webui/webui.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -518,4 +521,5 @@ build obj/components/dom_distiller/webui/webui.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/domain_reliability/domain_reliability.ninja b/obj/components/domain_reliability/domain_reliability.ninja index 58e6dd3..aecce71 100644 --- a/obj/components/domain_reliability/domain_reliability.ninja +++ b/obj/components/domain_reliability/domain_reliability.ninja @@ -10,4 +10,5 @@ target_output_name = domain_reliability ~ build obj/components/domain_reliability/domain_reliability.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/components/domain_reliability/domain_reliability.inputdeps.stamp: ~ build obj/components/domain_reliability/domain_reliability.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/domain_reliability/unit_tests.ninja b/obj/components/domain_reliability/unit_tests.ninja index be9dcc3..47a3db6 100644 --- a/obj/components/domain_reliability/unit_tests.ninja +++ b/obj/components/domain_reliability/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/domain_reliability/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/components/domain_reliability/unit_tests.inputdeps.stamp: ~ build obj/components/domain_reliability/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/drive/drive.ninja b/obj/components/drive/drive.ninja index 3227c24..da60a10 100644 --- a/obj/components/drive/drive.ninja +++ b/obj/components/drive/drive.ninja @@ -10,4 +10,5 @@ target_output_name = drive ~ build obj/components/drive/drive.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -176,4 +177,5 @@ build obj/components/drive/drive.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/enhanced_bookmarks/enhanced_bookmarks.ninja b/obj/components/enhanced_bookmarks/enhanced_bookmarks.ninja index b809eb5..8ab2947 100644 --- a/obj/components/enhanced_bookmarks/enhanced_bookmarks.ninja +++ b/obj/components/enhanced_bookmarks/enhanced_bookmarks.ninja @@ -10,4 +10,5 @@ target_output_name = enhanced_bookmarks ~ build obj/components/enhanced_bookmarks/enhanced_bookmarks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/enhanced_bookmarks/enhanced_bookmarks.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/enhanced_bookmarks/test_support.ninja b/obj/components/enhanced_bookmarks/test_support.ninja index 28e78f2..1e0004a 100644 --- a/obj/components/enhanced_bookmarks/test_support.ninja +++ b/obj/components/enhanced_bookmarks/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/enhanced_bookmarks/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/enhanced_bookmarks/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/enhanced_bookmarks/unit_tests.ninja b/obj/components/enhanced_bookmarks/unit_tests.ninja index a6040b7..1be11e2 100644 --- a/obj/components/enhanced_bookmarks/unit_tests.ninja +++ b/obj/components/enhanced_bookmarks/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/enhanced_bookmarks/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/enhanced_bookmarks/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/error_page/common/common.ninja b/obj/components/error_page/common/common.ninja index 59210b3..e762616 100644 --- a/obj/components/error_page/common/common.ninja +++ b/obj/components/error_page/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/error_page/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/components/error_page/common/common.inputdeps.stamp: build obj/components/error_page/common/common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -31,4 +34,5 @@ build obj/components/error_page/common/common.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/error_page/renderer/renderer.ninja b/obj/components/error_page/renderer/renderer.ninja index d2192d9..1e16339 100644 --- a/obj/components/error_page/renderer/renderer.ninja +++ b/obj/components/error_page/renderer/renderer.ninja @@ -10,4 +10,5 @@ target_output_name = renderer ~ build obj/components/error_page/renderer/renderer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -144,4 +145,5 @@ build obj/components/error_page/renderer/renderer.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/error_page/renderer/unit_tests.ninja b/obj/components/error_page/renderer/unit_tests.ninja index 1e56e39..a8f2ff8 100644 --- a/obj/components/error_page/renderer/unit_tests.ninja +++ b/obj/components/error_page/renderer/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/error_page/renderer/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,5 @@ build obj/components/error_page/renderer/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/favicon/content/content.ninja b/obj/components/favicon/content/content.ninja index ec190a2..42ebf90 100644 --- a/obj/components/favicon/content/content.ninja +++ b/obj/components/favicon/content/content.ninja @@ -10,4 +10,5 @@ target_output_name = content ~ build obj/components/favicon/content/content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -187,4 +188,5 @@ build obj/components/favicon/content/content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/favicon/core/core.ninja b/obj/components/favicon/core/core.ninja index 1bf802b..6fa641d 100644 --- a/obj/components/favicon/core/core.ninja +++ b/obj/components/favicon/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = core ~ build obj/components/favicon/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/favicon/core/core.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/favicon/core/unit_tests.ninja b/obj/components/favicon/core/unit_tests.ninja index 2afb00f..53185bb 100644 --- a/obj/components/favicon/core/unit_tests.ninja +++ b/obj/components/favicon/core/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/favicon/core/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/favicon/core/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/favicon_base/favicon_base.ninja b/obj/components/favicon_base/favicon_base.ninja index 8061030..84e27b3 100644 --- a/obj/components/favicon_base/favicon_base.ninja +++ b/obj/components/favicon_base/favicon_base.ninja @@ -10,4 +10,5 @@ target_output_name = favicon_base ~ build obj/components/favicon_base/favicon_base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/favicon_base/favicon_base.inputdeps.stamp: ~ build obj/components/favicon_base/favicon_base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/favicon_base/unit_tests.ninja b/obj/components/favicon_base/unit_tests.ninja index 157c385..20b8fdf 100644 --- a/obj/components/favicon_base/unit_tests.ninja +++ b/obj/components/favicon_base/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/favicon_base/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/favicon_base/unit_tests.inputdeps.stamp: ~ build obj/components/favicon_base/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/feedback/feedback.ninja b/obj/components/feedback/feedback.ninja index c8603fe..389870e 100644 --- a/obj/components/feedback/feedback.ninja +++ b/obj/components/feedback/feedback.ninja @@ -10,4 +10,5 @@ target_output_name = feedback ~ build obj/components/feedback/feedback.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -180,4 +181,5 @@ build obj/components/feedback/feedback.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/filesystem/apptests.ninja b/obj/components/filesystem/apptests.ninja index 665461e..42501b2 100644 --- a/obj/components/filesystem/apptests.ninja +++ b/obj/components/filesystem/apptests.ninja @@ -7,4 +7,5 @@ build filesystem_apptests/filesystem_apptests.mojo: ~ build obj/components/filesystem/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/filesystem/filesystem.ninja b/obj/components/filesystem/filesystem.ninja index 6e3f8e1..7889f7b 100644 --- a/obj/components/filesystem/filesystem.ninja +++ b/obj/components/filesystem/filesystem.ninja @@ -7,4 +7,5 @@ build filesystem/filesystem.mojo: ~ build obj/components/filesystem/filesystem.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/filesystem/filesystem_apptests_library.ninja b/obj/components/filesystem/filesystem_apptests_library.ninja index 7a64182..9049722 100644 --- a/obj/components/filesystem/filesystem_apptests_library.ninja +++ b/obj/components/filesystem/filesystem_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = filesystem_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./filesystem_apptests_library.dll ./filesystem_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -599,7 +602,9 @@ build ./filesystem_apptests_library.dll ./filesystem_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/filesystem/filesystem_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/filesystem/filesystem_library.ninja b/obj/components/filesystem/filesystem_library.ninja index 42ce365..3697102 100644 --- a/obj/components/filesystem/filesystem_library.ninja +++ b/obj/components/filesystem/filesystem_library.ninja @@ -9,9 +9,12 @@ target_output_name = filesystem_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./filesystem_library.dll ./filesystem_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -556,7 +559,9 @@ build ./filesystem_library.dll ./filesystem_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/filesystem/filesystem_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/filesystem/lib.ninja b/obj/components/filesystem/lib.ninja index 8212328..ae32b7d 100644 --- a/obj/components/filesystem/lib.ninja +++ b/obj/components/filesystem/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/filesystem/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,5 @@ build obj/components/filesystem/lib.inputdeps.stamp: ~ build obj/components/filesystem/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/filesystem/public/interfaces/interfaces.ninja b/obj/components/filesystem/public/interfaces/interfaces.ninja index a4dec85..869628d 100644 --- a/obj/components/filesystem/public/interfaces/interfaces.ninja +++ b/obj/components/filesystem/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/filesystem/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/filesystem/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/filesystem/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/filesystem/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/filesystem/public/interfaces/interfaces_cpp_sources.ninja index bd647c2..b6ed064 100644 --- a/obj/components/filesystem/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/filesystem/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/filesystem/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/filesystem/public/interfaces/interfaces_cpp_sources.inputde ~ build obj/components/filesystem/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/flags_ui/flags_ui.ninja b/obj/components/flags_ui/flags_ui.ninja index a7088d6..4be5939 100644 --- a/obj/components/flags_ui/flags_ui.ninja +++ b/obj/components/flags_ui/flags_ui.ninja @@ -10,4 +10,5 @@ target_output_name = flags_ui ~ build obj/components/flags_ui/flags_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/flags_ui/flags_ui.inputdeps.stamp: ~ build obj/components/flags_ui/flags_ui.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/flags_ui/unit_tests.ninja b/obj/components/flags_ui/unit_tests.ninja index 113ea74..8423ad2 100644 --- a/obj/components/flags_ui/unit_tests.ninja +++ b/obj/components/flags_ui/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/flags_ui/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/flags_ui/unit_tests.inputdeps.stamp: ~ build obj/components/flags_ui/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/crypto/crypto.ninja b/obj/components/gcm_driver/crypto/crypto.ninja index 155cf19..2a9626f 100644 --- a/obj/components/gcm_driver/crypto/crypto.ninja +++ b/obj/components/gcm_driver/crypto/crypto.ninja @@ -10,4 +10,5 @@ target_output_name = crypto ~ build obj/components/gcm_driver/crypto/crypto.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/components/gcm_driver/crypto/crypto.inputdeps.stamp: ~ build obj/components/gcm_driver/crypto/crypto.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/crypto/test_support.ninja b/obj/components/gcm_driver/crypto/test_support.ninja index 8cd40fd..080c654 100644 --- a/obj/components/gcm_driver/crypto/test_support.ninja +++ b/obj/components/gcm_driver/crypto/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/gcm_driver/crypto/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/components/gcm_driver/crypto/test_support.inputdeps.stamp: ~ build obj/components/gcm_driver/crypto/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/crypto/unit_tests.ninja b/obj/components/gcm_driver/crypto/unit_tests.ninja index 52f2293..c4fdebc 100644 --- a/obj/components/gcm_driver/crypto/unit_tests.ninja +++ b/obj/components/gcm_driver/crypto/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/gcm_driver/crypto/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/components/gcm_driver/crypto/unit_tests.inputdeps.stamp: ~ build obj/components/gcm_driver/crypto/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/gcm_driver.ninja b/obj/components/gcm_driver/gcm_driver.ninja index 750bb78..00840e5 100644 --- a/obj/components/gcm_driver/gcm_driver.ninja +++ b/obj/components/gcm_driver/gcm_driver.ninja @@ -9,8 +9,9 @@ target_output_name = gcm_driver ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/gcm_driver/gcm_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -73,4 +74,6 @@ build obj/components/gcm_driver/gcm_driver.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -273,4 +276,5 @@ build obj/components/gcm_driver/gcm_driver.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/gcm_driver/instance_id/instance_id.ninja b/obj/components/gcm_driver/instance_id/instance_id.ninja index 1ca7881..84d8c93 100644 --- a/obj/components/gcm_driver/instance_id/instance_id.ninja +++ b/obj/components/gcm_driver/instance_id/instance_id.ninja @@ -10,4 +10,5 @@ target_output_name = instance_id ~ build obj/components/gcm_driver/instance_id/instance_id.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/gcm_driver/instance_id/instance_id.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/instance_id/test_support.ninja b/obj/components/gcm_driver/instance_id/test_support.ninja index d420f9f..25a4340 100644 --- a/obj/components/gcm_driver/instance_id/test_support.ninja +++ b/obj/components/gcm_driver/instance_id/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/gcm_driver/instance_id/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/gcm_driver/instance_id/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/instance_id/unit_tests.ninja b/obj/components/gcm_driver/instance_id/unit_tests.ninja index 18ba26c..d0cbf4a 100644 --- a/obj/components/gcm_driver/instance_id/unit_tests.ninja +++ b/obj/components/gcm_driver/instance_id/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/gcm_driver/instance_id/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/gcm_driver/instance_id/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/test_support.ninja b/obj/components/gcm_driver/test_support.ninja index 2dcdcf0..e14a32c 100644 --- a/obj/components/gcm_driver/test_support.ninja +++ b/obj/components/gcm_driver/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/gcm_driver/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/gcm_driver/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/gcm_driver/unit_tests.ninja b/obj/components/gcm_driver/unit_tests.ninja index c1db4ea..81eafdb 100644 --- a/obj/components/gcm_driver/unit_tests.ninja +++ b/obj/components/gcm_driver/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/gcm_driver/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -79,4 +80,5 @@ build obj/components/gcm_driver/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/google/core/browser/browser.ninja b/obj/components/google/core/browser/browser.ninja index 83efb05..43ff4f4 100644 --- a/obj/components/google/core/browser/browser.ninja +++ b/obj/components/google/core/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/google/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,6 @@ build obj/components/google/core/browser/browser.inputdeps.stamp: build obj/components/google/core/browser/browser.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -95,4 +98,5 @@ build obj/components/google/core/browser/browser.lib: obj/ui/gfx/gfx_export.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/google/core/browser/unit_tests.ninja b/obj/components/google/core/browser/unit_tests.ninja index b914ccb..395b0a5 100644 --- a/obj/components/google/core/browser/unit_tests.ninja +++ b/obj/components/google/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/google/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -49,4 +50,5 @@ build obj/components/google/core/browser/unit_tests.inputdeps.stamp: ~ build obj/components/google/core/browser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/guest_view/browser/browser.ninja b/obj/components/guest_view/browser/browser.ninja index e230afe..7d5412b 100644 --- a/obj/components/guest_view/browser/browser.ninja +++ b/obj/components/guest_view/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = guest_view_browser ~ build obj/components/guest_view/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -204,4 +205,5 @@ build obj/components/guest_view/browser/guest_view_browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/guest_view/common/common.ninja b/obj/components/guest_view/common/common.ninja index 69c4bfa..2fcda71 100644 --- a/obj/components/guest_view/common/common.ninja +++ b/obj/components/guest_view/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = guest_view_common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/guest_view/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,6 @@ build obj/components/guest_view/common/common/guest_view_message_generator.obj: build obj/components/guest_view/common/guest_view_common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -56,4 +59,5 @@ build obj/components/guest_view/common/guest_view_common.lib: obj/third_party/boringssl/boringssl_asm.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/history/content/browser/browser.ninja b/obj/components/history/content/browser/browser.ninja index 40ecd7d..c4eb09a 100644 --- a/obj/components/history/content/browser/browser.ninja +++ b/obj/components/history/content/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/components/history/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -191,4 +192,6 @@ build obj/components/history/content/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -555,4 +558,5 @@ build obj/components/history/content/browser/browser.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/history/content/browser/unit_tests.ninja b/obj/components/history/content/browser/unit_tests.ninja index 321b9ba..e0b4c2a 100644 --- a/obj/components/history/content/browser/unit_tests.ninja +++ b/obj/components/history/content/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/history/content/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -187,4 +188,5 @@ build obj/components/history/content/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/history/core/browser/browser.ninja b/obj/components/history/core/browser/browser.ninja index d7ebf7d..002af88 100644 --- a/obj/components/history/core/browser/browser.ninja +++ b/obj/components/history/core/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/history/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,6 @@ build obj/components/history/core/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -279,4 +282,5 @@ build obj/components/history/core/browser/browser.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/history/core/browser/unit_tests.ninja b/obj/components/history/core/browser/unit_tests.ninja index 2e93911..5a258e0 100644 --- a/obj/components/history/core/browser/unit_tests.ninja +++ b/obj/components/history/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/history/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/history/core/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/history/core/common/common.ninja b/obj/components/history/core/common/common.ninja index c2d97a1..06464d0 100644 --- a/obj/components/history/core/common/common.ninja +++ b/obj/components/history/core/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/history/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/components/history/core/common/common.inputdeps.stamp: build obj/components/history/core/common/common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -25,4 +28,5 @@ build obj/components/history/core/common/common.lib: obj/components/history/core/common/common/thumbnail_score.obj ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/history/core/common/unit_tests.ninja b/obj/components/history/core/common/unit_tests.ninja index df0a93a..e5c17ce 100644 --- a/obj/components/history/core/common/unit_tests.ninja +++ b/obj/components/history/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/history/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/history/core/common/unit_tests.inputdeps.stamp: ~ build obj/components/history/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/history/core/test/test.ninja b/obj/components/history/core/test/test.ninja index 2f8aeb3..fc58ba3 100644 --- a/obj/components/history/core/test/test.ninja +++ b/obj/components/history/core/test/test.ninja @@ -9,8 +9,9 @@ target_output_name = test ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/history/core/test/test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,6 @@ build obj/components/history/core/test/test.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -254,4 +257,5 @@ build obj/components/history/core/test/test.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/html_viewer/apptests.ninja b/obj/components/html_viewer/apptests.ninja index a7d5166..26af3f9 100644 --- a/obj/components/html_viewer/apptests.ninja +++ b/obj/components/html_viewer/apptests.ninja @@ -7,4 +7,5 @@ build html_viewer_apptests/html_viewer_apptests.mojo: ~ build obj/components/html_viewer/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/html_viewer.ninja b/obj/components/html_viewer/html_viewer.ninja index 6af1da7..9801a61 100644 --- a/obj/components/html_viewer/html_viewer.ninja +++ b/obj/components/html_viewer/html_viewer.ninja @@ -7,4 +7,5 @@ build html_viewer/html_viewer.mojo: ~ build obj/components/html_viewer/html_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/html_viewer__copy_resources.ninja b/obj/components/html_viewer/html_viewer__copy_resources.ninja index 22e8865..1010b89 100644 --- a/obj/components/html_viewer/html_viewer__copy_resources.ninja +++ b/obj/components/html_viewer/html_viewer__copy_resources.ninja @@ -19,4 +19,5 @@ build html_viewer/resources/snapshot_blob.bin: ~ build obj/components/html_viewer/html_viewer__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/html_viewer_apptests_library.ninja b/obj/components/html_viewer/html_viewer_apptests_library.ninja index 0c4948f..95f4f84 100644 --- a/obj/components/html_viewer/html_viewer_apptests_library.ninja +++ b/obj/components/html_viewer/html_viewer_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = html_viewer_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./html_viewer_apptests_library.dll ./html_viewer_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7446,7 +7449,9 @@ build ./html_viewer_apptests_library.dll ./html_viewer_apptests_library.dll.lib: obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/components/html_viewer/html_viewer_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/html_viewer_library.ninja b/obj/components/html_viewer/html_viewer_library.ninja index 0bfd0a0..f5d86c7 100644 --- a/obj/components/html_viewer/html_viewer_library.ninja +++ b/obj/components/html_viewer/html_viewer_library.ninja @@ -9,9 +9,12 @@ target_output_name = html_viewer_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./html_viewer_library.dll ./html_viewer_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7540,7 +7543,9 @@ build ./html_viewer_library.dll ./html_viewer_library.dll.lib: obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/components/html_viewer/html_viewer_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/html_viewer_unittests.ninja b/obj/components/html_viewer/html_viewer_unittests.ninja index 91ba06b..c627c32 100644 --- a/obj/components/html_viewer/html_viewer_unittests.ninja +++ b/obj/components/html_viewer/html_viewer_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = html_viewer_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./html_viewer_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7670,7 +7673,9 @@ build ./html_viewer_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/components/html_viewer/html_viewer_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/layout_test_html_viewer.ninja b/obj/components/html_viewer/layout_test_html_viewer.ninja index 3d972c7..6310d60 100644 --- a/obj/components/html_viewer/layout_test_html_viewer.ninja +++ b/obj/components/html_viewer/layout_test_html_viewer.ninja @@ -7,4 +7,5 @@ build layout_test_html_viewer/layout_test_html_viewer.mojo: ~ build obj/components/html_viewer/layout_test_html_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/layout_test_html_viewer__copy_resources.ninja b/obj/components/html_viewer/layout_test_html_viewer__copy_resources.ninja index 5af11bb..62e9264 100644 --- a/obj/components/html_viewer/layout_test_html_viewer__copy_resources.ninja +++ b/obj/components/html_viewer/layout_test_html_viewer__copy_resources.ninja @@ -19,4 +19,5 @@ build layout_test_html_viewer/resources/snapshot_blob.bin: ~ build obj/components/html_viewer/layout_test_html_viewer__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/layout_test_html_viewer_library.ninja b/obj/components/html_viewer/layout_test_html_viewer_library.ninja index 0f491f7..087ad48 100644 --- a/obj/components/html_viewer/layout_test_html_viewer_library.ninja +++ b/obj/components/html_viewer/layout_test_html_viewer_library.ninja @@ -9,9 +9,12 @@ target_output_name = layout_test_html_viewer_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./layout_test_html_viewer_library.dll ./layout_test_html_viewer_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7683,7 +7686,9 @@ build ./layout_test_html_viewer_library.dll ./layout_test_html_viewer_library.dl obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/components/html_viewer/layout_test_html_viewer_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/html_viewer/lib.ninja b/obj/components/html_viewer/lib.ninja index 050db79..be96a6c 100644 --- a/obj/components/html_viewer/lib.ninja +++ b/obj/components/html_viewer/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/html_viewer/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -140,4 +141,5 @@ build obj/components/html_viewer/lib.inputdeps.stamp: ~ build obj/components/html_viewer/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/html_viewer/public/interfaces/interfaces.ninja b/obj/components/html_viewer/public/interfaces/interfaces.ninja index 5b997ce..df39aa0 100644 --- a/obj/components/html_viewer/public/interfaces/interfaces.ninja +++ b/obj/components/html_viewer/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/html_viewer/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/html_viewer/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/html_viewer/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.ninja index 48d1090..d40c1d3 100644 --- a/obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.inputd ~ build obj/components/html_viewer/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/infobars/core/core.ninja b/obj/components/infobars/core/core.ninja index 09baecb..43e3473 100644 --- a/obj/components/infobars/core/core.ninja +++ b/obj/components/infobars/core/core.ninja @@ -9,8 +9,9 @@ target_output_name = core ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/components/infobars/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,6 @@ build obj/components/infobars/core/core.inputdeps.stamp: build obj/components/infobars/core/core.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -105,4 +108,5 @@ build obj/components/infobars/core/core.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/invalidation/impl/impl.ninja b/obj/components/invalidation/impl/impl.ninja index 30ec0a0..e32cc15 100644 --- a/obj/components/invalidation/impl/impl.ninja +++ b/obj/components/invalidation/impl/impl.ninja @@ -10,4 +10,5 @@ target_output_name = impl ~ build obj/components/invalidation/impl/impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/invalidation/impl/impl.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/invalidation/impl/test_support.ninja b/obj/components/invalidation/impl/test_support.ninja index 72116e1..1b700f5 100644 --- a/obj/components/invalidation/impl/test_support.ninja +++ b/obj/components/invalidation/impl/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .lib ~ build obj/components/invalidation/impl/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -73,4 +74,6 @@ build obj/components/invalidation/impl/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -274,4 +277,5 @@ build obj/components/invalidation/impl/test_support.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/invalidation/impl/unit_tests.ninja b/obj/components/invalidation/impl/unit_tests.ninja index 3c4cbf4..6280285 100644 --- a/obj/components/invalidation/impl/unit_tests.ninja +++ b/obj/components/invalidation/impl/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/invalidation/impl/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -79,4 +80,5 @@ build obj/components/invalidation/impl/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/invalidation/public/public.ninja b/obj/components/invalidation/public/public.ninja index f222a35..0a5e36d 100644 --- a/obj/components/invalidation/public/public.ninja +++ b/obj/components/invalidation/public/public.ninja @@ -9,8 +9,9 @@ target_output_name = public ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/invalidation/public/public.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/components/invalidation/public/public.inputdeps.stamp: build obj/components/invalidation/public/public.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -36,4 +39,5 @@ build obj/components/invalidation/public/public.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/protobuf/protobuf_lite.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/json_schema/json_schema.ninja b/obj/components/json_schema/json_schema.ninja index 15d4387..9c07b9d 100644 --- a/obj/components/json_schema/json_schema.ninja +++ b/obj/components/json_schema/json_schema.ninja @@ -10,4 +10,5 @@ target_output_name = json_schema ~ build obj/components/json_schema/json_schema.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/json_schema/json_schema.inputdeps.stamp: ~ build obj/components/json_schema/json_schema.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/json_schema/unit_tests.ninja b/obj/components/json_schema/unit_tests.ninja index 82835e3..cc2f257 100644 --- a/obj/components/json_schema/unit_tests.ninja +++ b/obj/components/json_schema/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/json_schema/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/json_schema/unit_tests.inputdeps.stamp: ~ build obj/components/json_schema/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/keyed_service/content/content.ninja b/obj/components/keyed_service/content/content.ninja index 0a58ef7..6d1c195 100644 --- a/obj/components/keyed_service/content/content.ninja +++ b/obj/components/keyed_service/content/content.ninja @@ -10,4 +10,5 @@ target_output_name = keyed_service_content ~ build obj/components/keyed_service/content/content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -204,4 +205,5 @@ build obj/components/keyed_service/content/keyed_service_content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/keyed_service/content/unit_tests.ninja b/obj/components/keyed_service/content/unit_tests.ninja index fbddd8a..5967995 100644 --- a/obj/components/keyed_service/content/unit_tests.ninja +++ b/obj/components/keyed_service/content/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/keyed_service/content/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/keyed_service/content/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/keyed_service/core/core.ninja b/obj/components/keyed_service/core/core.ninja index 6e3221a..926d5dd 100644 --- a/obj/components/keyed_service/core/core.ninja +++ b/obj/components/keyed_service/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = keyed_service_core ~ build obj/components/keyed_service/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -63,4 +64,5 @@ build obj/components/keyed_service/core/core/refcounted_keyed_service_factory.ob ~ build obj/components/keyed_service/core/keyed_service_core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/keyed_service/core/unit_tests.ninja b/obj/components/keyed_service/core/unit_tests.ninja index 22ac0e2..5e3a151 100644 --- a/obj/components/keyed_service/core/unit_tests.ninja +++ b/obj/components/keyed_service/core/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/keyed_service/core/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/keyed_service/core/unit_tests.inputdeps.stamp: ~ build obj/components/keyed_service/core/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/language_usage_metrics/language_usage_metrics.ninja b/obj/components/language_usage_metrics/language_usage_metrics.ninja index fe66e31..2437264 100644 --- a/obj/components/language_usage_metrics/language_usage_metrics.ninja +++ b/obj/components/language_usage_metrics/language_usage_metrics.ninja @@ -10,4 +10,5 @@ target_output_name = language_usage_metrics ~ build obj/components/language_usage_metrics/language_usage_metrics.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/language_usage_metrics/language_usage_metrics.inputdeps.sta ~ build obj/components/language_usage_metrics/language_usage_metrics.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/language_usage_metrics/unit_tests.ninja b/obj/components/language_usage_metrics/unit_tests.ninja index 33b932d..0f3aeec 100644 --- a/obj/components/language_usage_metrics/unit_tests.ninja +++ b/obj/components/language_usage_metrics/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/language_usage_metrics/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/language_usage_metrics/unit_tests.inputdeps.stamp: ~ build obj/components/language_usage_metrics/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/leveldb_proto/leveldb_proto.ninja b/obj/components/leveldb_proto/leveldb_proto.ninja index 80ca425..dc8d230 100644 --- a/obj/components/leveldb_proto/leveldb_proto.ninja +++ b/obj/components/leveldb_proto/leveldb_proto.ninja @@ -10,4 +10,5 @@ target_output_name = leveldb_proto ~ build obj/components/leveldb_proto/leveldb_proto.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/leveldb_proto/leveldb_proto.inputdeps.stamp: ~ build obj/components/leveldb_proto/leveldb_proto.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/leveldb_proto/test_support.ninja b/obj/components/leveldb_proto/test_support.ninja index 5abec23..9ab8eb0 100644 --- a/obj/components/leveldb_proto/test_support.ninja +++ b/obj/components/leveldb_proto/test_support.ninja @@ -8,4 +8,5 @@ target_output_name = test_support ~ build obj/components/leveldb_proto/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -14,4 +15,5 @@ build obj/components/leveldb_proto/test_support.inputdeps.stamp: ~ build obj/components/leveldb_proto/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/leveldb_proto/unit_tests.ninja b/obj/components/leveldb_proto/unit_tests.ninja index 52c1930..f1f0804 100644 --- a/obj/components/leveldb_proto/unit_tests.ninja +++ b/obj/components/leveldb_proto/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/leveldb_proto/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/leveldb_proto/unit_tests.inputdeps.stamp: ~ build obj/components/leveldb_proto/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/login/login.ninja b/obj/components/login/login.ninja index a298154..729abcf 100644 --- a/obj/components/login/login.ninja +++ b/obj/components/login/login.ninja @@ -10,4 +10,5 @@ target_output_name = login ~ build obj/components/login/login.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/login/login.inputdeps.stamp: ~ build obj/components/login/login.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/login/unit_tests.ninja b/obj/components/login/unit_tests.ninja index ce50c29..997caf6 100644 --- a/obj/components/login/unit_tests.ninja +++ b/obj/components/login/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/login/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/login/unit_tests.inputdeps.stamp: ~ build obj/components/login/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/memory_pressure/memory_pressure.ninja b/obj/components/memory_pressure/memory_pressure.ninja index 0645f58..57b8770 100644 --- a/obj/components/memory_pressure/memory_pressure.ninja +++ b/obj/components/memory_pressure/memory_pressure.ninja @@ -10,4 +10,5 @@ target_output_name = memory_pressure ~ build obj/components/memory_pressure/memory_pressure.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/memory_pressure/memory_pressure.inputdeps.stamp: ~ build obj/components/memory_pressure/memory_pressure.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/memory_pressure/unit_tests.ninja b/obj/components/memory_pressure/unit_tests.ninja index 9ce6766..cd564b2 100644 --- a/obj/components/memory_pressure/unit_tests.ninja +++ b/obj/components/memory_pressure/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/memory_pressure/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/memory_pressure/unit_tests.inputdeps.stamp: ~ build obj/components/memory_pressure/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/message_port/message_port.ninja b/obj/components/message_port/message_port.ninja index aeb10ad..25df177 100644 --- a/obj/components/message_port/message_port.ninja +++ b/obj/components/message_port/message_port.ninja @@ -10,4 +10,5 @@ target_output_name = message_port ~ build obj/components/message_port/message_port.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/components/message_port/message_port.inputdeps.stamp: ~ build obj/components/message_port/message_port.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/gpu.ninja b/obj/components/metrics/gpu.ninja index 122d22d..12bae8a 100644 --- a/obj/components/metrics/gpu.ninja +++ b/obj/components/metrics/gpu.ninja @@ -10,4 +10,5 @@ target_output_name = gpu ~ build obj/components/metrics/gpu.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -176,4 +177,5 @@ build obj/components/metrics/gpu.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/metrics.ninja b/obj/components/metrics/metrics.ninja index 65c6520..a9c8fc9 100644 --- a/obj/components/metrics/metrics.ninja +++ b/obj/components/metrics/metrics.ninja @@ -10,4 +10,5 @@ target_output_name = metrics ~ build obj/components/metrics/metrics.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/components/metrics/metrics.inputdeps.stamp: ~ build obj/components/metrics/metrics.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/net.ninja b/obj/components/metrics/net.ninja index 75225d2..4aa8d68 100644 --- a/obj/components/metrics/net.ninja +++ b/obj/components/metrics/net.ninja @@ -9,8 +9,9 @@ target_output_name = net ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/components/metrics/net.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,6 @@ build obj/components/metrics/net.inputdeps.stamp: build obj/components/metrics/net.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -119,4 +122,5 @@ build obj/components/metrics/net.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/metrics/profiler.ninja b/obj/components/metrics/profiler.ninja index 13dd084..bc51f69 100644 --- a/obj/components/metrics/profiler.ninja +++ b/obj/components/metrics/profiler.ninja @@ -10,4 +10,5 @@ target_output_name = profiler ~ build obj/components/metrics/profiler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/components/metrics/profiler.inputdeps.stamp: ~ build obj/components/metrics/profiler.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/profiler_content.ninja b/obj/components/metrics/profiler_content.ninja index 3b3911a..4d82f5d 100644 --- a/obj/components/metrics/profiler_content.ninja +++ b/obj/components/metrics/profiler_content.ninja @@ -10,4 +10,5 @@ target_output_name = profiler_content ~ build obj/components/metrics/profiler_content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -176,4 +177,5 @@ build obj/components/metrics/profiler_content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/test_support.ninja b/obj/components/metrics/test_support.ninja index 5456780..6315ee8 100644 --- a/obj/components/metrics/test_support.ninja +++ b/obj/components/metrics/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/metrics/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/components/metrics/test_support.inputdeps.stamp: ~ build obj/components/metrics/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/ui.ninja b/obj/components/metrics/ui.ninja index bd1d9e5..9deb32f 100644 --- a/obj/components/metrics/ui.ninja +++ b/obj/components/metrics/ui.ninja @@ -10,4 +10,5 @@ target_output_name = ui ~ build obj/components/metrics/ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -33,4 +34,5 @@ build obj/components/metrics/ui.inputdeps.stamp: ~ build obj/components/metrics/ui.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics/unit_tests.ninja b/obj/components/metrics/unit_tests.ninja index 55504a1..5acae25 100644 --- a/obj/components/metrics/unit_tests.ninja +++ b/obj/components/metrics/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/metrics/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/metrics/unit_tests.inputdeps.stamp: ~ build obj/components/metrics/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/metrics_services_manager/metrics_services_manager.ninja b/obj/components/metrics_services_manager/metrics_services_manager.ninja index 0202f5b..77b9c6e 100644 --- a/obj/components/metrics_services_manager/metrics_services_manager.ninja +++ b/obj/components/metrics_services_manager/metrics_services_manager.ninja @@ -10,4 +10,5 @@ target_output_name = metrics_services_manager ~ build obj/components/metrics_services_manager/metrics_services_manager.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/components/metrics_services_manager/metrics_services_manager.inputdeps ~ build obj/components/metrics_services_manager/metrics_services_manager.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mime_util/mime_util.ninja b/obj/components/mime_util/mime_util.ninja index c18dbd4..1dc697b 100644 --- a/obj/components/mime_util/mime_util.ninja +++ b/obj/components/mime_util/mime_util.ninja @@ -9,8 +9,9 @@ target_output_name = mime_util ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .lib ~ build obj/components/mime_util/mime_util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,6 @@ build obj/components/mime_util/mime_util.inputdeps.stamp: build obj/components/mime_util/mime_util.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -109,4 +112,5 @@ build obj/components/mime_util/mime_util.lib: obj/ui/gfx/gfx_export.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/mime_util/unit_tests.ninja b/obj/components/mime_util/unit_tests.ninja index faf4bb9..e78950e 100644 --- a/obj/components/mime_util/unit_tests.ninja +++ b/obj/components/mime_util/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/mime_util/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/components/mime_util/unit_tests.inputdeps.stamp: ~ build obj/components/mime_util/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/common/common.ninja b/obj/components/mus/common/common.ninja index 7b4cf2c..82cc9e4 100644 --- a/obj/components/mus/common/common.ninja +++ b/obj/components/mus/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/mus/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/components/mus/common/common.inputdeps.stamp: ~ build obj/components/mus/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/mus/gles2/gles2.ninja b/obj/components/mus/gles2/gles2.ninja index d6c3bec..5f34ca1 100644 --- a/obj/components/mus/gles2/gles2.ninja +++ b/obj/components/mus/gles2/gles2.ninja @@ -10,4 +10,5 @@ target_output_name = gles2 ~ build obj/components/mus/gles2/gles2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/mus/gles2/gles2.inputdeps.stamp: ~ build obj/components/mus/gles2/gles2.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/gles2/lib.ninja b/obj/components/mus/gles2/lib.ninja index d718305..bb7321c 100644 --- a/obj/components/mus/gles2/lib.ninja +++ b/obj/components/mus/gles2/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/mus/gles2/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/mus/gles2/lib.inputdeps.stamp: ~ build obj/components/mus/gles2/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/lib.ninja b/obj/components/mus/lib.ninja index 4a4f8de..6eaaf89 100644 --- a/obj/components/mus/lib.ninja +++ b/obj/components/mus/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/mus/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/mus/lib.inputdeps.stamp: ~ build obj/components/mus/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/mus.ninja b/obj/components/mus/mus.ninja index a4a08c4..f2638a7 100644 --- a/obj/components/mus/mus.ninja +++ b/obj/components/mus/mus.ninja @@ -7,4 +7,5 @@ build mus/mus.mojo: ~ build obj/components/mus/mus.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/mus/mus_library.ninja b/obj/components/mus/mus_library.ninja index 49c5f8c..c534b18 100644 --- a/obj/components/mus/mus_library.ninja +++ b/obj/components/mus/mus_library.ninja @@ -9,9 +9,12 @@ target_output_name = mus_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./mus_library.dll ./mus_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3632,7 +3635,9 @@ build ./mus_library.dll ./mus_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/mus/mus_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/mus/public/cpp/cpp.ninja b/obj/components/mus/public/cpp/cpp.ninja index 77beafd..e50f38d 100644 --- a/obj/components/mus/public/cpp/cpp.ninja +++ b/obj/components/mus/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/components/mus/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/mus/public/cpp/cpp.inputdeps.stamp: ~ build obj/components/mus/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/public/cpp/tests/mojo_view_manager_lib_unittests.ninja b/obj/components/mus/public/cpp/tests/mojo_view_manager_lib_unittests.ninja index 732aef6..4473cb1 100644 --- a/obj/components/mus/public/cpp/tests/mojo_view_manager_lib_unittests.ninja +++ b/obj/components/mus/public/cpp/tests/mojo_view_manager_lib_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_view_manager_lib_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mojo_view_manager_lib_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3704,7 +3707,9 @@ build ./mojo_view_manager_lib_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/components/mus/public/cpp/tests/mojo_view_manager_lib_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/mus/public/cpp/tests/test_support.ninja b/obj/components/mus/public/cpp/tests/test_support.ninja index 0e5e49f..f90f253 100644 --- a/obj/components/mus/public/cpp/tests/test_support.ninja +++ b/obj/components/mus/public/cpp/tests/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/mus/public/cpp/tests/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/mus/public/cpp/tests/test_support.inputdeps.stamp: ~ build obj/components/mus/public/cpp/tests/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/public/cpp/tests/unittest_support.ninja b/obj/components/mus/public/cpp/tests/unittest_support.ninja index 28c6898..6fa7bfd 100644 --- a/obj/components/mus/public/cpp/tests/unittest_support.ninja +++ b/obj/components/mus/public/cpp/tests/unittest_support.ninja @@ -8,4 +8,5 @@ target_output_name = unittest_support ~ build obj/components/mus/public/cpp/tests/unittest_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/mus/public/cpp/tests/unittest_support.inputdeps.stamp: ~ build obj/components/mus/public/cpp/tests/unittest_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/public/interfaces/interfaces.ninja b/obj/components/mus/public/interfaces/interfaces.ninja index 3742e43..7ce3a67 100644 --- a/obj/components/mus/public/interfaces/interfaces.ninja +++ b/obj/components/mus/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/mus/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/mus/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/mus/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/mus/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/mus/public/interfaces/interfaces_cpp_sources.ninja index 93e4f98..c9b3368 100644 --- a/obj/components/mus/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/mus/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/mus/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/components/mus/public/interfaces/interfaces_cpp_sources.inputdeps.stam ~ build obj/components/mus/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/mus/surfaces/surfaces.ninja b/obj/components/mus/surfaces/surfaces.ninja index 0d101ee..2d066a3 100644 --- a/obj/components/mus/surfaces/surfaces.ninja +++ b/obj/components/mus/surfaces/surfaces.ninja @@ -10,4 +10,5 @@ target_output_name = surfaces ~ build obj/components/mus/surfaces/surfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/mus/surfaces/surfaces.inputdeps.stamp: ~ build obj/components/mus/surfaces/surfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/ws/apptests.ninja b/obj/components/mus/ws/apptests.ninja index 4c58e2d..8f6c2af 100644 --- a/obj/components/mus/ws/apptests.ninja +++ b/obj/components/mus/ws/apptests.ninja @@ -7,4 +7,5 @@ build mus_apptests/mus_apptests.mojo: ~ build obj/components/mus/ws/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/mus/ws/lib.ninja b/obj/components/mus/ws/lib.ninja index 2361ea0..4ab4e1d 100644 --- a/obj/components/mus/ws/lib.ninja +++ b/obj/components/mus/ws/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/mus/ws/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/mus/ws/lib.inputdeps.stamp: ~ build obj/components/mus/ws/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/ws/mus_apptests_library.ninja b/obj/components/mus/ws/mus_apptests_library.ninja index a2a523a..9ae195f 100644 --- a/obj/components/mus/ws/mus_apptests_library.ninja +++ b/obj/components/mus/ws/mus_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = mus_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./mus_apptests_library.dll ./mus_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3634,7 +3637,9 @@ build ./mus_apptests_library.dll ./mus_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/mus/ws/mus_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/mus/ws/test_support.ninja b/obj/components/mus/ws/test_support.ninja index 56eac80..2d0d862 100644 --- a/obj/components/mus/ws/test_support.ninja +++ b/obj/components/mus/ws/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/mus/ws/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/mus/ws/test_support.inputdeps.stamp: ~ build obj/components/mus/ws/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/mus/ws/window_manager_unittests.ninja b/obj/components/mus/ws/window_manager_unittests.ninja index 45ba3a1..fa1ac6f 100644 --- a/obj/components/mus/ws/window_manager_unittests.ninja +++ b/obj/components/mus/ws/window_manager_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = window_manager_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .exe ~ build ./window_manager_unittests.exe: ~ ./mojo_test_support.dll.lib ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3780,7 +3783,9 @@ build ./window_manager_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/components/mus/ws/window_manager_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/nacl/browser/browser.ninja b/obj/components/nacl/browser/browser.ninja index 071b8de..6390e47 100644 --- a/obj/components/nacl/browser/browser.ninja +++ b/obj/components/nacl/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/nacl/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,5 @@ build obj/components/nacl/browser/browser.stamp: nacl_win_as_x64/obj/native_client/src/trusted/service_runtime/sel_asm.stamp ~ nacl_win_as_x64/obj/native_client/src/trusted/validator_x86/nccopy_asm.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/nacl/common/common.ninja b/obj/components/nacl/common/common.ninja index e750705..b3c0618 100644 --- a/obj/components/nacl/common/common.ninja +++ b/obj/components/nacl/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/nacl/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/nacl/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/nacl/common/debug_exception_handler.ninja b/obj/components/nacl/common/debug_exception_handler.ninja index 022a83a..694c86d 100644 --- a/obj/components/nacl/common/debug_exception_handler.ninja +++ b/obj/components/nacl/common/debug_exception_handler.ninja @@ -10,4 +10,5 @@ target_output_name = debug_exception_handler ~ build obj/components/nacl/common/debug_exception_handler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/nacl/common/debug_exception_handler.inputdeps.stamp: ~ build obj/components/nacl/common/debug_exception_handler.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/nacl/common/minimal.ninja b/obj/components/nacl/common/minimal.ninja index 7019bd1..3e3175a 100644 --- a/obj/components/nacl/common/minimal.ninja +++ b/obj/components/nacl/common/minimal.ninja @@ -10,4 +10,5 @@ target_output_name = minimal ~ build obj/components/nacl/common/minimal.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/nacl/common/minimal.inputdeps.stamp: ~ build obj/components/nacl/common/minimal.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/nacl/common/process_type.ninja b/obj/components/nacl/common/process_type.ninja index 6852121..fd1e10d 100644 --- a/obj/components/nacl/common/process_type.ninja +++ b/obj/components/nacl/common/process_type.ninja @@ -8,4 +8,5 @@ target_output_name = process_type ~ build obj/components/nacl/common/process_type.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -139,4 +140,5 @@ build obj/components/nacl/common/process_type.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/nacl/loader/loader.ninja b/obj/components/nacl/loader/loader.ninja index b130a85..8be8b34 100644 --- a/obj/components/nacl/loader/loader.ninja +++ b/obj/components/nacl/loader/loader.ninja @@ -8,4 +8,5 @@ target_output_name = loader ~ build obj/components/nacl/loader/loader.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -143,4 +144,5 @@ build obj/components/nacl/loader/loader.stamp: nacl_win_as_x64/obj/native_client/src/trusted/service_runtime/sel_asm.stamp ~ nacl_win_as_x64/obj/native_client/src/trusted/validator_x86/nccopy_asm.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/nacl/loader/minimal.ninja b/obj/components/nacl/loader/minimal.ninja index 5721509..4e53d7b 100644 --- a/obj/components/nacl/loader/minimal.ninja +++ b/obj/components/nacl/loader/minimal.ninja @@ -10,4 +10,5 @@ target_output_name = minimal ~ build obj/components/nacl/loader/minimal.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/components/nacl/loader/minimal.stamp: nacl_win_as_x64/obj/native_client/src/trusted/service_runtime/sel_asm.stamp ~ nacl_win_as_x64/obj/native_client/src/trusted/validator_x86/nccopy_asm.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/nacl/loader/nacl_loader_unittests.ninja b/obj/components/nacl/loader/nacl_loader_unittests.ninja index 4cda0c2..3536878 100644 --- a/obj/components/nacl/loader/nacl_loader_unittests.ninja +++ b/obj/components/nacl/loader/nacl_loader_unittests.ninja @@ -9,10 +9,11 @@ target_output_name = nacl_loader_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib dxguid.lib mfreadwrite.lib ~ output_extension = .exe ~ build ./nacl_loader_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ nacl_win_as_x64/obj/build/config/nacl/nacl_base.stamp ~ @@ -29,4 +30,6 @@ build ./nacl_loader_unittests.exe: nacl_win_as_x64/obj/native_client/src/trusted/validator_x86/nccopy_asm.stamp ~ nacl_win_as_x64/obj/native_client/src/trusted/validator_x86/nccopy_asm/nccopycode_stores.obj ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -8068,7 +8071,9 @@ build ./nacl_loader_unittests.exe: obj/win8/metro_viewer_constants.stamp ~ obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ +| ~ || ~ ~ build obj/components/nacl/loader/nacl_loader_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/nacl/renderer/plugin/nacl_trusted_plugin.ninja b/obj/components/nacl/renderer/plugin/nacl_trusted_plugin.ninja index 95b5b45..a3ef899 100644 --- a/obj/components/nacl/renderer/plugin/nacl_trusted_plugin.ninja +++ b/obj/components/nacl/renderer/plugin/nacl_trusted_plugin.ninja @@ -10,4 +10,5 @@ target_output_name = nacl_trusted_plugin ~ build obj/components/nacl/renderer/plugin/nacl_trusted_plugin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -143,4 +144,5 @@ build obj/components/nacl/renderer/plugin/nacl_trusted_plugin.stamp: nacl_win_as_x64/obj/build/config/nacl/nacl_base.stamp ~ nacl_win_as_x64/obj/native_client/src/trusted/cpu_features/cpu_features_asm.stamp ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/navigation_interception/navigation_interception.ninja b/obj/components/navigation_interception/navigation_interception.ninja index 364bbc9..1e3716a 100644 --- a/obj/components/navigation_interception/navigation_interception.ninja +++ b/obj/components/navigation_interception/navigation_interception.ninja @@ -10,4 +10,5 @@ target_output_name = navigation_interception ~ build obj/components/navigation_interception/navigation_interception.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/navigation_interception/navigation_interception.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/navigation_metrics/navigation_metrics.ninja b/obj/components/navigation_metrics/navigation_metrics.ninja index 9a16441..1e7b35b 100644 --- a/obj/components/navigation_metrics/navigation_metrics.ninja +++ b/obj/components/navigation_metrics/navigation_metrics.ninja @@ -10,4 +10,5 @@ target_output_name = navigation_metrics ~ build obj/components/navigation_metrics/navigation_metrics.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/navigation_metrics/navigation_metrics.inputdeps.stamp: ~ build obj/components/navigation_metrics/navigation_metrics.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/net_log/net_log.ninja b/obj/components/net_log/net_log.ninja index fd6d20e..4bfd6ba 100644 --- a/obj/components/net_log/net_log.ninja +++ b/obj/components/net_log/net_log.ninja @@ -10,4 +10,5 @@ target_output_name = net_log ~ build obj/components/net_log/net_log.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/components/net_log/net_log.inputdeps.stamp: ~ build obj/components/net_log/net_log.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/net_log/unit_tests.ninja b/obj/components/net_log/unit_tests.ninja index 379cc42..26cda97 100644 --- a/obj/components/net_log/unit_tests.ninja +++ b/obj/components/net_log/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/net_log/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/components/net_log/unit_tests.inputdeps.stamp: ~ build obj/components/net_log/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/network_hints/common/common.ninja b/obj/components/network_hints/common/common.ninja index 5721d99..06fab23 100644 --- a/obj/components/network_hints/common/common.ninja +++ b/obj/components/network_hints/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/network_hints/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/network_hints/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/network_time/network_time.ninja b/obj/components/network_time/network_time.ninja index 3f5063e..d6cc35f 100644 --- a/obj/components/network_time/network_time.ninja +++ b/obj/components/network_time/network_time.ninja @@ -9,8 +9,9 @@ target_output_name = network_time ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/network_time/network_time.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/components/network_time/network_time.inputdeps.stamp: build obj/components/network_time/network_time.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -31,4 +34,5 @@ build obj/components/network_time/network_time.lib: obj/third_party/icu/icuuc.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/network_time/unit_tests.ninja b/obj/components/network_time/unit_tests.ninja index d9d6c3d..f2c8880 100644 --- a/obj/components/network_time/unit_tests.ninja +++ b/obj/components/network_time/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/network_time/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/network_time/unit_tests.inputdeps.stamp: ~ build obj/components/network_time/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/ntp_snippets/ntp_snippets.ninja b/obj/components/ntp_snippets/ntp_snippets.ninja index ada7aaf..f2cbdb6 100644 --- a/obj/components/ntp_snippets/ntp_snippets.ninja +++ b/obj/components/ntp_snippets/ntp_snippets.ninja @@ -10,4 +10,5 @@ target_output_name = ntp_snippets ~ build obj/components/ntp_snippets/ntp_snippets.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/ntp_snippets/ntp_snippets.inputdeps.stamp: ~ build obj/components/ntp_snippets/ntp_snippets.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/ntp_snippets/unit_tests.ninja b/obj/components/ntp_snippets/unit_tests.ninja index 54b61c2..f7f02aa 100644 --- a/obj/components/ntp_snippets/unit_tests.ninja +++ b/obj/components/ntp_snippets/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/ntp_snippets/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/ntp_snippets/unit_tests.inputdeps.stamp: ~ build obj/components/ntp_snippets/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/offline_pages/offline_pages.ninja b/obj/components/offline_pages/offline_pages.ninja index 7d0964f..d0600f5 100644 --- a/obj/components/offline_pages/offline_pages.ninja +++ b/obj/components/offline_pages/offline_pages.ninja @@ -9,8 +9,9 @@ target_output_name = offline_pages ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/offline_pages/offline_pages.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -62,4 +63,6 @@ build obj/components/offline_pages/offline_pages.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -197,4 +200,5 @@ build obj/components/offline_pages/offline_pages.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/offline_pages/test_support.ninja b/obj/components/offline_pages/test_support.ninja index 3ae0356..55a996f 100644 --- a/obj/components/offline_pages/test_support.ninja +++ b/obj/components/offline_pages/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/offline_pages/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -62,4 +63,6 @@ build obj/components/offline_pages/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -195,4 +198,5 @@ build obj/components/offline_pages/test_support.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/offline_pages/unit_tests.ninja b/obj/components/offline_pages/unit_tests.ninja index 1a2b46b..0f2da6f 100644 --- a/obj/components/offline_pages/unit_tests.ninja +++ b/obj/components/offline_pages/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/offline_pages/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,5 @@ build obj/components/offline_pages/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/omnibox/browser/browser.ninja b/obj/components/omnibox/browser/browser.ninja index c09526b..0b20529 100644 --- a/obj/components/omnibox/browser/browser.ninja +++ b/obj/components/omnibox/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/omnibox/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -193,4 +194,5 @@ build obj/components/omnibox/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/omnibox/browser/test_support.ninja b/obj/components/omnibox/browser/test_support.ninja index 4be57be..a45113f 100644 --- a/obj/components/omnibox/browser/test_support.ninja +++ b/obj/components/omnibox/browser/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/omnibox/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -197,4 +198,6 @@ build obj/components/omnibox/browser/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -572,4 +575,5 @@ build obj/components/omnibox/browser/test_support.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/omnibox/browser/unit_tests.ninja b/obj/components/omnibox/browser/unit_tests.ninja index faa9708..ecd21a6 100644 --- a/obj/components/omnibox/browser/unit_tests.ninja +++ b/obj/components/omnibox/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/omnibox/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -193,4 +194,5 @@ build obj/components/omnibox/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/onc/onc.ninja b/obj/components/onc/onc.ninja index f039dbb..74cda44 100644 --- a/obj/components/onc/onc.ninja +++ b/obj/components/onc/onc.ninja @@ -10,4 +10,5 @@ target_output_name = onc ~ build obj/components/onc/onc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/onc/onc.inputdeps.stamp: ~ build obj/components/onc/onc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/open_from_clipboard/open_from_clipboard.ninja b/obj/components/open_from_clipboard/open_from_clipboard.ninja index d3a062a..09a9eda 100644 --- a/obj/components/open_from_clipboard/open_from_clipboard.ninja +++ b/obj/components/open_from_clipboard/open_from_clipboard.ninja @@ -10,4 +10,5 @@ target_output_name = open_from_clipboard ~ build obj/components/open_from_clipboard/open_from_clipboard.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/open_from_clipboard/open_from_clipboard.inputdeps.stamp: ~ build obj/components/open_from_clipboard/open_from_clipboard.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/open_from_clipboard/test_support.ninja b/obj/components/open_from_clipboard/test_support.ninja index 410136f..478e331 100644 --- a/obj/components/open_from_clipboard/test_support.ninja +++ b/obj/components/open_from_clipboard/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/open_from_clipboard/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/open_from_clipboard/test_support.inputdeps.stamp: ~ build obj/components/open_from_clipboard/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/open_from_clipboard/unit_tests.ninja b/obj/components/open_from_clipboard/unit_tests.ninja index d8988b4..6341e55 100644 --- a/obj/components/open_from_clipboard/unit_tests.ninja +++ b/obj/components/open_from_clipboard/unit_tests.ninja @@ -8,4 +8,5 @@ target_output_name = unit_tests ~ build obj/components/open_from_clipboard/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -14,4 +15,5 @@ build obj/components/open_from_clipboard/unit_tests.inputdeps.stamp: ~ build obj/components/open_from_clipboard/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/os_crypt/os_crypt.ninja b/obj/components/os_crypt/os_crypt.ninja index a53faba..b20f134 100644 --- a/obj/components/os_crypt/os_crypt.ninja +++ b/obj/components/os_crypt/os_crypt.ninja @@ -10,4 +10,5 @@ target_output_name = os_crypt ~ build obj/components/os_crypt/os_crypt.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/os_crypt/os_crypt.inputdeps.stamp: ~ build obj/components/os_crypt/os_crypt.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/os_crypt/unit_tests.ninja b/obj/components/os_crypt/unit_tests.ninja index f9ed3a0..f1dd358 100644 --- a/obj/components/os_crypt/unit_tests.ninja +++ b/obj/components/os_crypt/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/os_crypt/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/os_crypt/unit_tests.inputdeps.stamp: ~ build obj/components/os_crypt/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/packed_ct_ev_whitelist/packed_ct_ev_whitelist.ninja b/obj/components/packed_ct_ev_whitelist/packed_ct_ev_whitelist.ninja index b57eaa9..f5e9348 100644 --- a/obj/components/packed_ct_ev_whitelist/packed_ct_ev_whitelist.ninja +++ b/obj/components/packed_ct_ev_whitelist/packed_ct_ev_whitelist.ninja @@ -9,6 +9,6 @@ target_output_name = packed_ct_ev_whitelist ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib winmm.lib ws2_32.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/packed_ct_ev_whitelist/packed_ct_ev_whitelist.inputdeps.stamp: ~ diff --git a/obj/components/page_load_metrics/browser/browser.ninja b/obj/components/page_load_metrics/browser/browser.ninja index c6c9c4f..6e1373d 100644 --- a/obj/components/page_load_metrics/browser/browser.ninja +++ b/obj/components/page_load_metrics/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/page_load_metrics/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -181,4 +182,6 @@ build obj/components/page_load_metrics/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -499,4 +502,5 @@ build obj/components/page_load_metrics/browser/browser.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/page_load_metrics/common/common.ninja b/obj/components/page_load_metrics/common/common.ninja index bd47c87..1200dab 100644 --- a/obj/components/page_load_metrics/common/common.ninja +++ b/obj/components/page_load_metrics/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/page_load_metrics/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -32,4 +33,6 @@ build obj/components/page_load_metrics/common/common.inputdeps.stamp: build obj/components/page_load_metrics/common/common.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -44,4 +47,5 @@ build obj/components/page_load_metrics/common/common.lib: obj/third_party/boringssl/boringssl_asm.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/page_load_metrics/renderer/renderer.ninja b/obj/components/page_load_metrics/renderer/renderer.ninja index 1194cf9..1767c4d 100644 --- a/obj/components/page_load_metrics/renderer/renderer.ninja +++ b/obj/components/page_load_metrics/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/page_load_metrics/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/password_manager/content/browser/browser.ninja b/obj/components/password_manager/content/browser/browser.ninja index 3e8fafc..08ed41b 100644 --- a/obj/components/password_manager/content/browser/browser.ninja +++ b/obj/components/password_manager/content/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/password_manager/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -195,4 +196,5 @@ build obj/components/password_manager/content/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/content/common/common.ninja b/obj/components/password_manager/content/common/common.ninja index fb65d86..1088116 100644 --- a/obj/components/password_manager/content/common/common.ninja +++ b/obj/components/password_manager/content/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/password_manager/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,6 @@ build obj/components/password_manager/content/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -379,4 +382,5 @@ build obj/components/password_manager/content/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/password_manager/content/renderer/renderer.ninja b/obj/components/password_manager/content/renderer/renderer.ninja index 24a0ac3..a32d97e 100644 --- a/obj/components/password_manager/content/renderer/renderer.ninja +++ b/obj/components/password_manager/content/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/password_manager/content/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/password_manager/core/browser/browser.ninja b/obj/components/password_manager/core/browser/browser.ninja index fea2b76..48f6701 100644 --- a/obj/components/password_manager/core/browser/browser.ninja +++ b/obj/components/password_manager/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/password_manager/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -74,4 +75,5 @@ build obj/components/password_manager/core/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/core/browser/test_support.ninja b/obj/components/password_manager/core/browser/test_support.ninja index 4b3314f..18144ca 100644 --- a/obj/components/password_manager/core/browser/test_support.ninja +++ b/obj/components/password_manager/core/browser/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/password_manager/core/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -74,4 +75,5 @@ build obj/components/password_manager/core/browser/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/core/browser/unit_tests.ninja b/obj/components/password_manager/core/browser/unit_tests.ninja index 6253657..8dd775f 100644 --- a/obj/components/password_manager/core/browser/unit_tests.ninja +++ b/obj/components/password_manager/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/password_manager/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -84,4 +85,5 @@ build obj/components/password_manager/core/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/core/common/common.ninja b/obj/components/password_manager/core/common/common.ninja index 9037521..2a1eca3 100644 --- a/obj/components/password_manager/core/common/common.ninja +++ b/obj/components/password_manager/core/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/password_manager/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/password_manager/core/common/common.inputdeps.stamp: ~ build obj/components/password_manager/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/core/common/unit_tests.ninja b/obj/components/password_manager/core/common/unit_tests.ninja index dec642d..721433b 100644 --- a/obj/components/password_manager/core/common/unit_tests.ninja +++ b/obj/components/password_manager/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/password_manager/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/password_manager/core/common/unit_tests.inputdeps.stamp: ~ build obj/components/password_manager/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/sync/browser/browser.ninja b/obj/components/password_manager/sync/browser/browser.ninja index 4f4d8d0..ba48f42 100644 --- a/obj/components/password_manager/sync/browser/browser.ninja +++ b/obj/components/password_manager/sync/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/password_manager/sync/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -74,4 +75,5 @@ build obj/components/password_manager/sync/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/password_manager/sync/browser/unit_tests.ninja b/obj/components/password_manager/sync/browser/unit_tests.ninja index 7f749d5..e6186e3 100644 --- a/obj/components/password_manager/sync/browser/unit_tests.ninja +++ b/obj/components/password_manager/sync/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/password_manager/sync/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -84,4 +85,5 @@ build obj/components/password_manager/sync/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/pdf/browser/browser.ninja b/obj/components/pdf/browser/browser.ninja index 10e7421..285ac3c 100644 --- a/obj/components/pdf/browser/browser.ninja +++ b/obj/components/pdf/browser/browser.ninja @@ -9,8 +9,9 @@ target_output_name = browser ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/components/pdf/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/components/pdf/browser/browser.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -484,4 +487,5 @@ build obj/components/pdf/browser/browser.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/pdf/common/common.ninja b/obj/components/pdf/common/common.ninja index 0ac4962..ba29384 100644 --- a/obj/components/pdf/common/common.ninja +++ b/obj/components/pdf/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/pdf/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,6 @@ build obj/components/pdf/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -374,4 +377,5 @@ build obj/components/pdf/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/pdf/renderer/renderer.ninja b/obj/components/pdf/renderer/renderer.ninja index 2e11f48..87d5e19 100644 --- a/obj/components/pdf/renderer/renderer.ninja +++ b/obj/components/pdf/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/pdf/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/pdf_viewer/pdf_viewer.ninja b/obj/components/pdf_viewer/pdf_viewer.ninja index a0d3239..89a9c60 100644 --- a/obj/components/pdf_viewer/pdf_viewer.ninja +++ b/obj/components/pdf_viewer/pdf_viewer.ninja @@ -1,4 +1,5 @@ ~ build obj/components/pdf_viewer/pdf_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/pdf_viewer/pdf_viewer_library.ninja b/obj/components/pdf_viewer/pdf_viewer_library.ninja index 815ab94..ccfc746 100644 --- a/obj/components/pdf_viewer/pdf_viewer_library.ninja +++ b/obj/components/pdf_viewer/pdf_viewer_library.ninja @@ -9,9 +9,12 @@ target_output_name = pdf_viewer_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./pdf_viewer_library.dll ./pdf_viewer_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -4065,7 +4068,9 @@ build ./pdf_viewer_library.dll ./pdf_viewer_library.dll.lib: obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/components/pdf_viewer/pdf_viewer_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/plugins/renderer/renderer.ninja b/obj/components/plugins/renderer/renderer.ninja index d425d86..031e856 100644 --- a/obj/components/plugins/renderer/renderer.ninja +++ b/obj/components/plugins/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib winmm.lib ws2_32.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/plugins/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/policy/core/browser/browser.ninja b/obj/components/policy/core/browser/browser.ninja index 1044a8f..540817a 100644 --- a/obj/components/policy/core/browser/browser.ninja +++ b/obj/components/policy/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/policy/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -60,4 +61,5 @@ build obj/components/policy/core/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/core/browser/unit_tests.ninja b/obj/components/policy/core/browser/unit_tests.ninja index 495e2b7..5c02f77 100644 --- a/obj/components/policy/core/browser/unit_tests.ninja +++ b/obj/components/policy/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/policy/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -61,4 +62,5 @@ build obj/components/policy/core/browser/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/core/common/common.ninja b/obj/components/policy/core/common/common.ninja index 7385249..af56a3a 100644 --- a/obj/components/policy/core/common/common.ninja +++ b/obj/components/policy/core/common/common.ninja @@ -12,4 +12,5 @@ target_output_name = common ~ build obj/components/policy/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/components/policy/core/common/common.inputdeps.stamp: ~ build obj/components/policy/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/core/common/unit_tests.ninja b/obj/components/policy/core/common/unit_tests.ninja index 18fb25c..737335c 100644 --- a/obj/components/policy/core/common/unit_tests.ninja +++ b/obj/components/policy/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/policy/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,5 @@ build obj/components/policy/core/common/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/policy.ninja b/obj/components/policy/policy.ninja index a2351bb..1e55baf 100644 --- a/obj/components/policy/policy.ninja +++ b/obj/components/policy/policy.ninja @@ -9,8 +9,9 @@ target_output_name = policy ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/policy/policy.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,6 @@ build obj/components/policy/policy.inputdeps.stamp: build obj/components/policy/policy.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -32,4 +35,5 @@ build obj/components/policy/policy.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/protobuf/protobuf_lite.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/policy/policy_component_browser.ninja b/obj/components/policy/policy_component_browser.ninja index 1a342b6..450282e 100644 --- a/obj/components/policy/policy_component_browser.ninja +++ b/obj/components/policy/policy_component_browser.ninja @@ -8,4 +8,5 @@ target_output_name = policy_component_browser ~ build obj/components/policy/policy_component_browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,5 @@ build obj/components/policy/policy_component_browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/policy_component_common.ninja b/obj/components/policy/policy_component_common.ninja index 0e6a682..538f53a 100644 --- a/obj/components/policy/policy_component_common.ninja +++ b/obj/components/policy/policy_component_common.ninja @@ -8,4 +8,5 @@ target_output_name = policy_component_common ~ build obj/components/policy/policy_component_common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/components/policy/policy_component_common.inputdeps.stamp: ~ build obj/components/policy/policy_component_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/policy/policy_component_test_support.ninja b/obj/components/policy/policy_component_test_support.ninja index a056bdc..5f210a0 100644 --- a/obj/components/policy/policy_component_test_support.ninja +++ b/obj/components/policy/policy_component_test_support.ninja @@ -10,4 +10,5 @@ target_output_name = policy_component_test_support ~ build obj/components/policy/policy_component_test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -61,4 +62,5 @@ build obj/components/policy/policy_component_test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/power/power.ninja b/obj/components/power/power.ninja index 6cc2a2d..57669ff 100644 --- a/obj/components/power/power.ninja +++ b/obj/components/power/power.ninja @@ -9,8 +9,9 @@ target_output_name = power ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/power/power.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/components/power/power.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -488,4 +491,5 @@ build obj/components/power/power.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/power/unit_tests.ninja b/obj/components/power/unit_tests.ninja index f739bfa..c9a29bb 100644 --- a/obj/components/power/unit_tests.ninja +++ b/obj/components/power/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/power/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/power/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/precache/content/content.ninja b/obj/components/precache/content/content.ninja index de4aa30..b0588ce 100644 --- a/obj/components/precache/content/content.ninja +++ b/obj/components/precache/content/content.ninja @@ -10,4 +10,5 @@ target_output_name = content ~ build obj/components/precache/content/content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -188,4 +189,5 @@ build obj/components/precache/content/content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/precache/core/core.ninja b/obj/components/precache/core/core.ninja index 0e56622..329594c 100644 --- a/obj/components/precache/core/core.ninja +++ b/obj/components/precache/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = core ~ build obj/components/precache/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -68,4 +69,5 @@ build obj/components/precache/core/core.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/precache/core/unit_tests.ninja b/obj/components/precache/core/unit_tests.ninja index 227cb0a..cdc60f1 100644 --- a/obj/components/precache/core/unit_tests.ninja +++ b/obj/components/precache/core/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/precache/core/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -78,4 +79,5 @@ build obj/components/precache/core/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/pref_registry/pref_registry.ninja b/obj/components/pref_registry/pref_registry.ninja index ea7bd24..3bc0933 100644 --- a/obj/components/pref_registry/pref_registry.ninja +++ b/obj/components/pref_registry/pref_registry.ninja @@ -10,4 +10,5 @@ target_output_name = pref_registry ~ build obj/components/pref_registry/pref_registry.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/pref_registry/pref_registry.inputdeps.stamp: ~ build obj/components/pref_registry/pref_registry.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/pref_registry/test_support.ninja b/obj/components/pref_registry/test_support.ninja index ffdf497..9550d21 100644 --- a/obj/components/pref_registry/test_support.ninja +++ b/obj/components/pref_registry/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/pref_registry/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/pref_registry/test_support.inputdeps.stamp: ~ build obj/components/pref_registry/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/printing/browser/browser.ninja b/obj/components/printing/browser/browser.ninja index b386eff..dc7618c 100644 --- a/obj/components/printing/browser/browser.ninja +++ b/obj/components/printing/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/printing/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/printing/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/printing/common/common.ninja b/obj/components/printing/common/common.ninja index 8a9f089..942f1a0 100644 --- a/obj/components/printing/common/common.ninja +++ b/obj/components/printing/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/printing/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -125,4 +126,5 @@ build obj/components/printing/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/profile_metrics/profile_metrics.ninja b/obj/components/profile_metrics/profile_metrics.ninja index 3bef2b1..52a8064 100644 --- a/obj/components/profile_metrics/profile_metrics.ninja +++ b/obj/components/profile_metrics/profile_metrics.ninja @@ -9,8 +9,9 @@ target_output_name = profile_metrics ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/profile_metrics/profile_metrics.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/components/profile_metrics/profile_metrics.inputdeps.stamp: build obj/components/profile_metrics/profile_metrics.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -25,4 +28,5 @@ build obj/components/profile_metrics/profile_metrics.lib: obj/components/profile_metrics/profile_metrics/counts.obj ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/proximity_auth/ble/ble.ninja b/obj/components/proximity_auth/ble/ble.ninja index 7328dd5..b25b6a9 100644 --- a/obj/components/proximity_auth/ble/ble.ninja +++ b/obj/components/proximity_auth/ble/ble.ninja @@ -10,4 +10,5 @@ target_output_name = ble ~ build obj/components/proximity_auth/ble/ble.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/components/proximity_auth/ble/ble.inputdeps.stamp: ~ build obj/components/proximity_auth/ble/ble.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/ble/unit_tests.ninja b/obj/components/proximity_auth/ble/unit_tests.ninja index 9c212b4..a2cd04d 100644 --- a/obj/components/proximity_auth/ble/unit_tests.ninja +++ b/obj/components/proximity_auth/ble/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/proximity_auth/ble/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,5 @@ build obj/components/proximity_auth/ble/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/cryptauth/cryptauth.ninja b/obj/components/proximity_auth/cryptauth/cryptauth.ninja index 295489b..3cfc7de 100644 --- a/obj/components/proximity_auth/cryptauth/cryptauth.ninja +++ b/obj/components/proximity_auth/cryptauth/cryptauth.ninja @@ -10,4 +10,5 @@ target_output_name = cryptauth ~ build obj/components/proximity_auth/cryptauth/cryptauth.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -70,4 +71,5 @@ build obj/components/proximity_auth/cryptauth/cryptauth.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/cryptauth/test_support.ninja b/obj/components/proximity_auth/cryptauth/test_support.ninja index 378c290..2d5ca9d 100644 --- a/obj/components/proximity_auth/cryptauth/test_support.ninja +++ b/obj/components/proximity_auth/cryptauth/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/proximity_auth/cryptauth/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -70,4 +71,5 @@ build obj/components/proximity_auth/cryptauth/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/cryptauth/unit_tests.ninja b/obj/components/proximity_auth/cryptauth/unit_tests.ninja index 7b3e1ee..0e040e3 100644 --- a/obj/components/proximity_auth/cryptauth/unit_tests.ninja +++ b/obj/components/proximity_auth/cryptauth/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/proximity_auth/cryptauth/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -81,4 +82,5 @@ build obj/components/proximity_auth/cryptauth/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/logging/logging.ninja b/obj/components/proximity_auth/logging/logging.ninja index cc464ca..2977753 100644 --- a/obj/components/proximity_auth/logging/logging.ninja +++ b/obj/components/proximity_auth/logging/logging.ninja @@ -10,4 +10,5 @@ target_output_name = logging ~ build obj/components/proximity_auth/logging/logging.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/proximity_auth/logging/logging.inputdeps.stamp: ~ build obj/components/proximity_auth/logging/logging.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/proximity_auth/logging/unit_tests.ninja b/obj/components/proximity_auth/logging/unit_tests.ninja index de7952b..452d764 100644 --- a/obj/components/proximity_auth/logging/unit_tests.ninja +++ b/obj/components/proximity_auth/logging/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/proximity_auth/logging/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/proximity_auth/logging/unit_tests.inputdeps.stamp: ~ build obj/components/proximity_auth/logging/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/proximity_auth.ninja b/obj/components/proximity_auth/proximity_auth.ninja index 0b6d9f4..55509d2 100644 --- a/obj/components/proximity_auth/proximity_auth.ninja +++ b/obj/components/proximity_auth/proximity_auth.ninja @@ -10,4 +10,5 @@ target_output_name = proximity_auth ~ build obj/components/proximity_auth/proximity_auth.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,5 @@ build obj/components/proximity_auth/proximity_auth.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/proximity_auth_unittests.ninja b/obj/components/proximity_auth/proximity_auth_unittests.ninja index c677e54..b252294 100644 --- a/obj/components/proximity_auth/proximity_auth_unittests.ninja +++ b/obj/components/proximity_auth/proximity_auth_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = proximity_auth_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./proximity_auth_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -5074,7 +5077,9 @@ build ./proximity_auth_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/components/proximity_auth/proximity_auth_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/proximity_auth/test_support.ninja b/obj/components/proximity_auth/test_support.ninja index 1536d90..3d83033 100644 --- a/obj/components/proximity_auth/test_support.ninja +++ b/obj/components/proximity_auth/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/proximity_auth/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -71,4 +72,5 @@ build obj/components/proximity_auth/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/unit_tests.ninja b/obj/components/proximity_auth/unit_tests.ninja index 8eceac4..278cfca 100644 --- a/obj/components/proximity_auth/unit_tests.ninja +++ b/obj/components/proximity_auth/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/proximity_auth/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -81,4 +82,5 @@ build obj/components/proximity_auth/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proximity_auth/webui/webui.ninja b/obj/components/proximity_auth/webui/webui.ninja index f7085a8..67cafe1 100644 --- a/obj/components/proximity_auth/webui/webui.ninja +++ b/obj/components/proximity_auth/webui/webui.ninja @@ -9,8 +9,9 @@ target_output_name = webui ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/proximity_auth/webui/webui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -197,4 +198,6 @@ build obj/components/proximity_auth/webui/webui.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -572,4 +575,5 @@ build obj/components/proximity_auth/webui/webui.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/proxy_config/proxy_config.ninja b/obj/components/proxy_config/proxy_config.ninja index 66d0cd1..2ec31d8 100644 --- a/obj/components/proxy_config/proxy_config.ninja +++ b/obj/components/proxy_config/proxy_config.ninja @@ -10,4 +10,5 @@ target_output_name = proxy_config ~ build obj/components/proxy_config/proxy_config.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/proxy_config/proxy_config.inputdeps.stamp: ~ build obj/components/proxy_config/proxy_config.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/proxy_config/unit_tests.ninja b/obj/components/proxy_config/unit_tests.ninja index 933f6a6..e7afab8 100644 --- a/obj/components/proxy_config/unit_tests.ninja +++ b/obj/components/proxy_config/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/proxy_config/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/proxy_config/unit_tests.inputdeps.stamp: ~ build obj/components/proxy_config/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/query_parser/query_parser.ninja b/obj/components/query_parser/query_parser.ninja index 1857280..33fb5de 100644 --- a/obj/components/query_parser/query_parser.ninja +++ b/obj/components/query_parser/query_parser.ninja @@ -10,4 +10,5 @@ target_output_name = query_parser ~ build obj/components/query_parser/query_parser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/query_parser/query_parser.inputdeps.stamp: ~ build obj/components/query_parser/query_parser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/query_parser/unit_tests.ninja b/obj/components/query_parser/unit_tests.ninja index 55ed1a8..0a54b52 100644 --- a/obj/components/query_parser/unit_tests.ninja +++ b/obj/components/query_parser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/query_parser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/query_parser/unit_tests.inputdeps.stamp: ~ build obj/components/query_parser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/rappor/rappor.ninja b/obj/components/rappor/rappor.ninja index 9ade894..26ee72b 100644 --- a/obj/components/rappor/rappor.ninja +++ b/obj/components/rappor/rappor.ninja @@ -10,4 +10,5 @@ target_output_name = rappor ~ build obj/components/rappor/rappor.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/components/rappor/rappor.inputdeps.stamp: ~ build obj/components/rappor/rappor.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/rappor/test_support.ninja b/obj/components/rappor/test_support.ninja index b157fa6..91d2ae0 100644 --- a/obj/components/rappor/test_support.ninja +++ b/obj/components/rappor/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/rappor/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,6 @@ build obj/components/rappor/test_support.inputdeps.stamp: build obj/components/rappor/test_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -78,4 +81,5 @@ build obj/components/rappor/test_support.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/rappor/unit_tests.ninja b/obj/components/rappor/unit_tests.ninja index 6afc3ad..13028f1 100644 --- a/obj/components/rappor/unit_tests.ninja +++ b/obj/components/rappor/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/rappor/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/rappor/unit_tests.inputdeps.stamp: ~ build obj/components/rappor/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/renderer_context_menu/renderer_context_menu.ninja b/obj/components/renderer_context_menu/renderer_context_menu.ninja index a1ef472..a1451ed 100644 --- a/obj/components/renderer_context_menu/renderer_context_menu.ninja +++ b/obj/components/renderer_context_menu/renderer_context_menu.ninja @@ -9,8 +9,9 @@ target_output_name = renderer_context_menu ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/renderer_context_menu/renderer_context_menu.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -193,4 +194,6 @@ build obj/components/renderer_context_menu/renderer_context_menu.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -560,4 +563,5 @@ build obj/components/renderer_context_menu/renderer_context_menu.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/resource_provider/apptests.ninja b/obj/components/resource_provider/apptests.ninja index 00098b9..f305e1e 100644 --- a/obj/components/resource_provider/apptests.ninja +++ b/obj/components/resource_provider/apptests.ninja @@ -1,4 +1,5 @@ ~ build obj/components/resource_provider/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/resource_provider/lib.ninja b/obj/components/resource_provider/lib.ninja index b1e9e83..99fcd1f 100644 --- a/obj/components/resource_provider/lib.ninja +++ b/obj/components/resource_provider/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/resource_provider/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,5 @@ build obj/components/resource_provider/lib.inputdeps.stamp: ~ build obj/components/resource_provider/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/resource_provider/public/cpp/cpp.ninja b/obj/components/resource_provider/public/cpp/cpp.ninja index 49821f2..682c634 100644 --- a/obj/components/resource_provider/public/cpp/cpp.ninja +++ b/obj/components/resource_provider/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/components/resource_provider/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/components/resource_provider/public/cpp/cpp.inputdeps.stamp: ~ build obj/components/resource_provider/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/resource_provider/public/interfaces/interfaces.ninja b/obj/components/resource_provider/public/interfaces/interfaces.ninja index e2fc3dd..5e45bb2 100644 --- a/obj/components/resource_provider/public/interfaces/interfaces.ninja +++ b/obj/components/resource_provider/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/resource_provider/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/resource_provider/public/interfaces/interfaces.inputdeps.st ~ build obj/components/resource_provider/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.ninja index b1a7057..bd168ba 100644 --- a/obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/components/resource_provider/public/interfaces/interfaces_cpp_sources. ~ build obj/components/resource_provider/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/resource_provider/resource_provider.ninja b/obj/components/resource_provider/resource_provider.ninja index 4920bba..795f38c 100644 --- a/obj/components/resource_provider/resource_provider.ninja +++ b/obj/components/resource_provider/resource_provider.ninja @@ -1,4 +1,5 @@ ~ build obj/components/resource_provider/resource_provider.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/resource_provider/resource_provider_apptests__copy_resources.ninja b/obj/components/resource_provider/resource_provider_apptests__copy_resources.ninja index b584358..ee9aa77 100644 --- a/obj/components/resource_provider/resource_provider_apptests__copy_resources.ninja +++ b/obj/components/resource_provider/resource_provider_apptests__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/components/resource_provider/resource_provider_apptests__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/resource_provider/resource_provider_apptests_library.ninja b/obj/components/resource_provider/resource_provider_apptests_library.ninja index c44c980..7ea30b2 100644 --- a/obj/components/resource_provider/resource_provider_apptests_library.ninja +++ b/obj/components/resource_provider/resource_provider_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = resource_provider_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./resource_provider_apptests_library.dll ./resource_provider_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -598,7 +601,9 @@ build ./resource_provider_apptests_library.dll ./resource_provider_apptests_libr obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/resource_provider/resource_provider_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/resource_provider/resource_provider_library.ninja b/obj/components/resource_provider/resource_provider_library.ninja index 8e673b8..77b9e9e 100644 --- a/obj/components/resource_provider/resource_provider_library.ninja +++ b/obj/components/resource_provider/resource_provider_library.ninja @@ -9,9 +9,12 @@ target_output_name = resource_provider_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./resource_provider_library.dll ./resource_provider_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -550,7 +553,9 @@ build ./resource_provider_library.dll ./resource_provider_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/resource_provider/resource_provider_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/resource_provider/resource_provider_unittests.ninja b/obj/components/resource_provider/resource_provider_unittests.ninja index fdafcc5..cd4017b 100644 --- a/obj/components/resource_provider/resource_provider_unittests.ninja +++ b/obj/components/resource_provider/resource_provider_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = resource_provider_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./resource_provider_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -668,7 +671,9 @@ build ./resource_provider_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/components/resource_provider/resource_provider_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/rlz/rlz.ninja b/obj/components/rlz/rlz.ninja index 11de05d..e768248 100644 --- a/obj/components/rlz/rlz.ninja +++ b/obj/components/rlz/rlz.ninja @@ -10,4 +10,5 @@ target_output_name = rlz ~ build obj/components/rlz/rlz.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/components/rlz/rlz.inputdeps.stamp: ~ build obj/components/rlz/rlz.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/rlz/unit_tests.ninja b/obj/components/rlz/unit_tests.ninja index aa11d48..d381486 100644 --- a/obj/components/rlz/unit_tests.ninja +++ b/obj/components/rlz/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/rlz/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/rlz/unit_tests.inputdeps.stamp: ~ build obj/components/rlz/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_browsing_db/prefix_set.ninja b/obj/components/safe_browsing_db/prefix_set.ninja index 81e59d6..ecdb4c9 100644 --- a/obj/components/safe_browsing_db/prefix_set.ninja +++ b/obj/components/safe_browsing_db/prefix_set.ninja @@ -10,4 +10,5 @@ target_output_name = prefix_set ~ build obj/components/safe_browsing_db/prefix_set.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/safe_browsing_db/prefix_set.inputdeps.stamp: ~ build obj/components/safe_browsing_db/prefix_set.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_browsing_db/unit_tests.ninja b/obj/components/safe_browsing_db/unit_tests.ninja index c69d303..9b54cdb 100644 --- a/obj/components/safe_browsing_db/unit_tests.ninja +++ b/obj/components/safe_browsing_db/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/safe_browsing_db/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/safe_browsing_db/unit_tests.inputdeps.stamp: ~ build obj/components/safe_browsing_db/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_browsing_db/util.ninja b/obj/components/safe_browsing_db/util.ninja index 17c4026..dd2c60f 100644 --- a/obj/components/safe_browsing_db/util.ninja +++ b/obj/components/safe_browsing_db/util.ninja @@ -10,4 +10,5 @@ target_output_name = util ~ build obj/components/safe_browsing_db/util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/safe_browsing_db/util.inputdeps.stamp: ~ build obj/components/safe_browsing_db/util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_json/safe_json.ninja b/obj/components/safe_json/safe_json.ninja index 64151a3..3dc7752 100644 --- a/obj/components/safe_json/safe_json.ninja +++ b/obj/components/safe_json/safe_json.ninja @@ -10,4 +10,5 @@ target_output_name = safe_json ~ build obj/components/safe_json/safe_json.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/safe_json/safe_json.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_json/safe_json_parser_message_filter.ninja b/obj/components/safe_json/safe_json_parser_message_filter.ninja index 0e6e4c3..ed4b971 100644 --- a/obj/components/safe_json/safe_json_parser_message_filter.ninja +++ b/obj/components/safe_json/safe_json_parser_message_filter.ninja @@ -10,4 +10,5 @@ target_output_name = safe_json_parser_message_filter ~ build obj/components/safe_json/safe_json_parser_message_filter.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -146,4 +147,5 @@ build obj/components/safe_json/safe_json_parser_message_filter.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_json/test_support.ninja b/obj/components/safe_json/test_support.ninja index 291bb15..ab7e9a2 100644 --- a/obj/components/safe_json/test_support.ninja +++ b/obj/components/safe_json/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/safe_json/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/safe_json/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/safe_json/unit_tests.ninja b/obj/components/safe_json/unit_tests.ninja index 7b91a64..ca7d2b0 100644 --- a/obj/components/safe_json/unit_tests.ninja +++ b/obj/components/safe_json/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/safe_json/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/safe_json/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/scheduler/scheduler.ninja b/obj/components/scheduler/scheduler.ninja index 0dedede..210b217 100644 --- a/obj/components/scheduler/scheduler.ninja +++ b/obj/components/scheduler/scheduler.ninja @@ -10,4 +10,5 @@ target_output_name = scheduler ~ build obj/components/scheduler/scheduler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/components/scheduler/scheduler.inputdeps.stamp: ~ build obj/components/scheduler/scheduler.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/scheduler/test_support.ninja b/obj/components/scheduler/test_support.ninja index 3bfb47c..b12cf3c 100644 --- a/obj/components/scheduler/test_support.ninja +++ b/obj/components/scheduler/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/scheduler/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/components/scheduler/test_support.inputdeps.stamp: ~ build obj/components/scheduler/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/scheduler/unit_tests.ninja b/obj/components/scheduler/unit_tests.ninja index 4f97dbd..fdb5e47 100644 --- a/obj/components/scheduler/unit_tests.ninja +++ b/obj/components/scheduler/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/scheduler/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/components/scheduler/unit_tests.inputdeps.stamp: ~ build obj/components/scheduler/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search/search.ninja b/obj/components/search/search.ninja index 3c59171..c246aa9 100644 --- a/obj/components/search/search.ninja +++ b/obj/components/search/search.ninja @@ -10,4 +10,5 @@ target_output_name = search ~ build obj/components/search/search.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/search/search.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search/unit_tests.ninja b/obj/components/search/unit_tests.ninja index b7f90d8..2094477 100644 --- a/obj/components/search/unit_tests.ninja +++ b/obj/components/search/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/search/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/search/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search_engines/search_engines.ninja b/obj/components/search_engines/search_engines.ninja index b8d1bab..4626a8a 100644 --- a/obj/components/search_engines/search_engines.ninja +++ b/obj/components/search_engines/search_engines.ninja @@ -9,8 +9,9 @@ target_output_name = search_engines ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/search_engines/search_engines.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -73,4 +74,6 @@ build obj/components/search_engines/search_engines.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -269,4 +272,5 @@ build obj/components/search_engines/search_engines.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/search_engines/test_support.ninja b/obj/components/search_engines/test_support.ninja index 3c506cd..f981936 100644 --- a/obj/components/search_engines/test_support.ninja +++ b/obj/components/search_engines/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/search_engines/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -69,4 +70,5 @@ build obj/components/search_engines/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search_engines/unit_tests.ninja b/obj/components/search_engines/unit_tests.ninja index 4d6290d..0cd75ad 100644 --- a/obj/components/search_engines/unit_tests.ninja +++ b/obj/components/search_engines/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/search_engines/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -70,4 +71,5 @@ build obj/components/search_engines/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search_provider_logos/search_provider_logos.ninja b/obj/components/search_provider_logos/search_provider_logos.ninja index 095f40f..1233abc 100644 --- a/obj/components/search_provider_logos/search_provider_logos.ninja +++ b/obj/components/search_provider_logos/search_provider_logos.ninja @@ -10,4 +10,5 @@ target_output_name = search_provider_logos ~ build obj/components/search_provider_logos/search_provider_logos.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/search_provider_logos/search_provider_logos.inputdeps.stamp ~ build obj/components/search_provider_logos/search_provider_logos.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/search_provider_logos/unit_tests.ninja b/obj/components/search_provider_logos/unit_tests.ninja index f9ef7bb..f62791c 100644 --- a/obj/components/search_provider_logos/unit_tests.ninja +++ b/obj/components/search_provider_logos/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/search_provider_logos/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,5 @@ build obj/components/search_provider_logos/unit_tests.inputdeps.stamp: ~ build obj/components/search_provider_logos/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/security_interstitials/core/core.ninja b/obj/components/security_interstitials/core/core.ninja index 3ecb6f9..68d04d0 100644 --- a/obj/components/security_interstitials/core/core.ninja +++ b/obj/components/security_interstitials/core/core.ninja @@ -9,8 +9,9 @@ target_output_name = core ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/security_interstitials/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -72,4 +73,6 @@ build obj/components/security_interstitials/core/core.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -254,4 +257,5 @@ build obj/components/security_interstitials/core/core.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/security_state/security_state.ninja b/obj/components/security_state/security_state.ninja index d65eb3b..3033671 100644 --- a/obj/components/security_state/security_state.ninja +++ b/obj/components/security_state/security_state.ninja @@ -10,4 +10,5 @@ target_output_name = security_state ~ build obj/components/security_state/security_state.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/security_state/security_state.inputdeps.stamp: ~ build obj/components/security_state/security_state.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/security_state/unit_tests.ninja b/obj/components/security_state/unit_tests.ninja index 657d42b..6a91a95 100644 --- a/obj/components/security_state/unit_tests.ninja +++ b/obj/components/security_state/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/security_state/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/security_state/unit_tests.inputdeps.stamp: ~ build obj/components/security_state/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sessions/sessions.ninja b/obj/components/sessions/sessions.ninja index d9851f0..55dc21b 100644 --- a/obj/components/sessions/sessions.ninja +++ b/obj/components/sessions/sessions.ninja @@ -10,4 +10,5 @@ target_output_name = sessions ~ build obj/components/sessions/sessions.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/sessions/sessions.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sessions/shared.ninja b/obj/components/sessions/shared.ninja index 4d254a3..08e7338 100644 --- a/obj/components/sessions/shared.ninja +++ b/obj/components/sessions/shared.ninja @@ -10,4 +10,5 @@ target_output_name = shared ~ build obj/components/sessions/shared.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/sessions/shared.inputdeps.stamp: ~ build obj/components/sessions/shared.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sessions/test_support.ninja b/obj/components/sessions/test_support.ninja index 5824519..b6cfb10 100644 --- a/obj/components/sessions/test_support.ninja +++ b/obj/components/sessions/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/sessions/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/sessions/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sessions/unit_tests.ninja b/obj/components/sessions/unit_tests.ninja index 802ac3a..2812095 100644 --- a/obj/components/sessions/unit_tests.ninja +++ b/obj/components/sessions/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/sessions/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/components/sessions/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/signin/core/account_id/account_id.ninja b/obj/components/signin/core/account_id/account_id.ninja index 984e789..1a51f5c 100644 --- a/obj/components/signin/core/account_id/account_id.ninja +++ b/obj/components/signin/core/account_id/account_id.ninja @@ -10,4 +10,5 @@ target_output_name = account_id ~ build obj/components/signin/core/account_id/account_id.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/signin/core/account_id/account_id.inputdeps.stamp: ~ build obj/components/signin/core/account_id/account_id.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/signin/core/browser/browser.ninja b/obj/components/signin/core/browser/browser.ninja index 11b489d..93a19d6 100644 --- a/obj/components/signin/core/browser/browser.ninja +++ b/obj/components/signin/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/signin/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -42,4 +43,5 @@ build obj/components/signin/core/browser/browser.inputdeps.stamp: ~ build obj/components/signin/core/browser/browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/signin/core/browser/test_support.ninja b/obj/components/signin/core/browser/test_support.ninja index 0936880..8d07ba8 100644 --- a/obj/components/signin/core/browser/test_support.ninja +++ b/obj/components/signin/core/browser/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/signin/core/browser/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/signin/core/browser/test_support.inputdeps.stamp: ~ build obj/components/signin/core/browser/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/signin/core/browser/unit_tests.ninja b/obj/components/signin/core/browser/unit_tests.ninja index 321c913..837384e 100644 --- a/obj/components/signin/core/browser/unit_tests.ninja +++ b/obj/components/signin/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/signin/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -52,4 +53,5 @@ build obj/components/signin/core/browser/unit_tests.inputdeps.stamp: ~ build obj/components/signin/core/browser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/signin/core/common/common.ninja b/obj/components/signin/core/common/common.ninja index 4301c53..d241319 100644 --- a/obj/components/signin/core/common/common.ninja +++ b/obj/components/signin/core/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/signin/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/signin/core/common/common.inputdeps.stamp: ~ build obj/components/signin/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/ssl_config/ssl_config.ninja b/obj/components/ssl_config/ssl_config.ninja index 94c8765..b5ef781 100644 --- a/obj/components/ssl_config/ssl_config.ninja +++ b/obj/components/ssl_config/ssl_config.ninja @@ -10,4 +10,5 @@ target_output_name = ssl_config ~ build obj/components/ssl_config/ssl_config.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/ssl_config/ssl_config.inputdeps.stamp: ~ build obj/components/ssl_config/ssl_config.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/ssl_config/unit_tests.ninja b/obj/components/ssl_config/unit_tests.ninja index e1ecdb2..db3283f 100644 --- a/obj/components/ssl_config/unit_tests.ninja +++ b/obj/components/ssl_config/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/ssl_config/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/ssl_config/unit_tests.inputdeps.stamp: ~ build obj/components/ssl_config/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/ssl_errors/ssl_errors.ninja b/obj/components/ssl_errors/ssl_errors.ninja index 04bd4ad..f068b83 100644 --- a/obj/components/ssl_errors/ssl_errors.ninja +++ b/obj/components/ssl_errors/ssl_errors.ninja @@ -10,4 +10,5 @@ target_output_name = ssl_errors ~ build obj/components/ssl_errors/ssl_errors.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/ssl_errors/ssl_errors.inputdeps.stamp: ~ build obj/components/ssl_errors/ssl_errors.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/ssl_errors/unit_tests.ninja b/obj/components/ssl_errors/unit_tests.ninja index 99d1bb7..b694935 100644 --- a/obj/components/ssl_errors/unit_tests.ninja +++ b/obj/components/ssl_errors/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/ssl_errors/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/ssl_errors/unit_tests.inputdeps.stamp: ~ build obj/components/ssl_errors/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/startup_metric_utils/browser/lib.ninja b/obj/components/startup_metric_utils/browser/lib.ninja index bdf0b3f..c569f3a 100644 --- a/obj/components/startup_metric_utils/browser/lib.ninja +++ b/obj/components/startup_metric_utils/browser/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/startup_metric_utils/browser/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/startup_metric_utils/browser/lib.inputdeps.stamp: ~ build obj/components/startup_metric_utils/browser/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/startup_metric_utils/browser/message_filter_lib.ninja b/obj/components/startup_metric_utils/browser/message_filter_lib.ninja index f0c0691..bd2c420 100644 --- a/obj/components/startup_metric_utils/browser/message_filter_lib.ninja +++ b/obj/components/startup_metric_utils/browser/message_filter_lib.ninja @@ -10,4 +10,5 @@ target_output_name = message_filter_lib ~ build obj/components/startup_metric_utils/browser/message_filter_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -175,4 +176,5 @@ build obj/components/startup_metric_utils/browser/message_filter_lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/startup_metric_utils/common/common.ninja b/obj/components/startup_metric_utils/common/common.ninja index 7956c3e..556d76a 100644 --- a/obj/components/startup_metric_utils/common/common.ninja +++ b/obj/components/startup_metric_utils/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/startup_metric_utils/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/startup_metric_utils/common/common.inputdeps.stamp: ~ build obj/components/startup_metric_utils/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/storage_monitor/storage_monitor.ninja b/obj/components/storage_monitor/storage_monitor.ninja index de74b0b..1d70009 100644 --- a/obj/components/storage_monitor/storage_monitor.ninja +++ b/obj/components/storage_monitor/storage_monitor.ninja @@ -10,4 +10,5 @@ target_output_name = storage_monitor ~ build obj/components/storage_monitor/storage_monitor.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/storage_monitor/storage_monitor.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/storage_monitor/test_support.ninja b/obj/components/storage_monitor/test_support.ninja index 94c43c9..edf851d 100644 --- a/obj/components/storage_monitor/test_support.ninja +++ b/obj/components/storage_monitor/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/storage_monitor/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/storage_monitor/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/suggestions/suggestions.ninja b/obj/components/suggestions/suggestions.ninja index d97f5d5..1b09b8f 100644 --- a/obj/components/suggestions/suggestions.ninja +++ b/obj/components/suggestions/suggestions.ninja @@ -10,4 +10,5 @@ target_output_name = suggestions ~ build obj/components/suggestions/suggestions.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/components/suggestions/suggestions.inputdeps.stamp: ~ build obj/components/suggestions/suggestions.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/suggestions/unit_tests.ninja b/obj/components/suggestions/unit_tests.ninja index c6ce83c..a7e983a 100644 --- a/obj/components/suggestions/unit_tests.ninja +++ b/obj/components/suggestions/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/suggestions/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/components/suggestions/unit_tests.inputdeps.stamp: ~ build obj/components/suggestions/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_bookmarks/sync_bookmarks.ninja b/obj/components/sync_bookmarks/sync_bookmarks.ninja index dfbd163..342aedc 100644 --- a/obj/components/sync_bookmarks/sync_bookmarks.ninja +++ b/obj/components/sync_bookmarks/sync_bookmarks.ninja @@ -10,4 +10,5 @@ target_output_name = sync_bookmarks ~ build obj/components/sync_bookmarks/sync_bookmarks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/sync_bookmarks/sync_bookmarks.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_bookmarks/unit_tests.ninja b/obj/components/sync_bookmarks/unit_tests.ninja index a9f179a..105dd75 100644 --- a/obj/components/sync_bookmarks/unit_tests.ninja +++ b/obj/components/sync_bookmarks/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/sync_bookmarks/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/sync_bookmarks/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_driver/sync_driver.ninja b/obj/components/sync_driver/sync_driver.ninja index cc95f66..373ff54 100644 --- a/obj/components/sync_driver/sync_driver.ninja +++ b/obj/components/sync_driver/sync_driver.ninja @@ -10,4 +10,5 @@ target_output_name = sync_driver ~ build obj/components/sync_driver/sync_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/sync_driver/sync_driver.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_driver/test_support.ninja b/obj/components/sync_driver/test_support.ninja index 71251a1..acc2741 100644 --- a/obj/components/sync_driver/test_support.ninja +++ b/obj/components/sync_driver/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/sync_driver/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/components/sync_driver/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_driver/unit_tests.ninja b/obj/components/sync_driver/unit_tests.ninja index d9c4fd9..0627068 100644 --- a/obj/components/sync_driver/unit_tests.ninja +++ b/obj/components/sync_driver/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/sync_driver/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -79,4 +80,5 @@ build obj/components/sync_driver/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_sessions/sync_sessions.ninja b/obj/components/sync_sessions/sync_sessions.ninja index 63c252d..9f6701a 100644 --- a/obj/components/sync_sessions/sync_sessions.ninja +++ b/obj/components/sync_sessions/sync_sessions.ninja @@ -10,4 +10,5 @@ target_output_name = sync_sessions ~ build obj/components/sync_sessions/sync_sessions.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -187,4 +188,5 @@ build obj/components/sync_sessions/sync_sessions.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_sessions/test_support.ninja b/obj/components/sync_sessions/test_support.ninja index b3724df..7c84831 100644 --- a/obj/components/sync_sessions/test_support.ninja +++ b/obj/components/sync_sessions/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/sync_sessions/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -187,4 +188,5 @@ build obj/components/sync_sessions/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/sync_sessions/unit_tests.ninja b/obj/components/sync_sessions/unit_tests.ninja index 38233ab..d1c58a6 100644 --- a/obj/components/sync_sessions/unit_tests.ninja +++ b/obj/components/sync_sessions/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/sync_sessions/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -187,4 +188,5 @@ build obj/components/sync_sessions/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/syncable_prefs/syncable_prefs.ninja b/obj/components/syncable_prefs/syncable_prefs.ninja index 739cb59..88f680f 100644 --- a/obj/components/syncable_prefs/syncable_prefs.ninja +++ b/obj/components/syncable_prefs/syncable_prefs.ninja @@ -10,4 +10,5 @@ target_output_name = syncable_prefs ~ build obj/components/syncable_prefs/syncable_prefs.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -62,4 +63,5 @@ build obj/components/syncable_prefs/syncable_prefs.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/syncable_prefs/test_support.ninja b/obj/components/syncable_prefs/test_support.ninja index b0985f2..14a960c 100644 --- a/obj/components/syncable_prefs/test_support.ninja +++ b/obj/components/syncable_prefs/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/syncable_prefs/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -62,4 +63,5 @@ build obj/components/syncable_prefs/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/syncable_prefs/unit_tests.ninja b/obj/components/syncable_prefs/unit_tests.ninja index 35dc869..c4ae3b3 100644 --- a/obj/components/syncable_prefs/unit_tests.ninja +++ b/obj/components/syncable_prefs/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/syncable_prefs/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -62,4 +63,5 @@ build obj/components/syncable_prefs/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/test_runner/test_runner.ninja b/obj/components/test_runner/test_runner.ninja index c75e85a..3038c25 100644 --- a/obj/components/test_runner/test_runner.ninja +++ b/obj/components/test_runner/test_runner.ninja @@ -10,4 +10,5 @@ target_output_name = test_runner ~ build obj/components/test_runner/test_runner.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -123,4 +124,5 @@ build obj/components/test_runner/test_runner.inputdeps.stamp: ~ build obj/components/test_runner/test_runner.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/toolbar/toolbar.ninja b/obj/components/toolbar/toolbar.ninja index 995dd27..44b27dc 100644 --- a/obj/components/toolbar/toolbar.ninja +++ b/obj/components/toolbar/toolbar.ninja @@ -10,4 +10,5 @@ target_output_name = toolbar ~ build obj/components/toolbar/toolbar.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/toolbar/toolbar.inputdeps.stamp: ~ build obj/components/toolbar/toolbar.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/tracing/startup_tracing.ninja b/obj/components/tracing/startup_tracing.ninja index 3bcb5c0..a560e61 100644 --- a/obj/components/tracing/startup_tracing.ninja +++ b/obj/components/tracing/startup_tracing.ninja @@ -10,4 +10,5 @@ target_output_name = startup_tracing ~ build obj/components/tracing/startup_tracing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/tracing/startup_tracing.inputdeps.stamp: ~ build obj/components/tracing/startup_tracing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/tracing/tracing.ninja b/obj/components/tracing/tracing.ninja index 0a8f0d3..504b6f7 100644 --- a/obj/components/tracing/tracing.ninja +++ b/obj/components/tracing/tracing.ninja @@ -10,4 +10,5 @@ target_output_name = tracing ~ build obj/components/tracing/tracing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/tracing/tracing.inputdeps.stamp: ~ build obj/components/tracing/tracing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/tracing/unit_tests.ninja b/obj/components/tracing/unit_tests.ninja index 6fa8929..0c72ad9 100644 --- a/obj/components/tracing/unit_tests.ninja +++ b/obj/components/tracing/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/tracing/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/tracing/unit_tests.inputdeps.stamp: ~ build obj/components/tracing/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/translate/content/browser/browser.ninja b/obj/components/translate/content/browser/browser.ninja index ede6104..f5a3b8a 100644 --- a/obj/components/translate/content/browser/browser.ninja +++ b/obj/components/translate/content/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/translate/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -179,4 +180,5 @@ build obj/components/translate/content/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/translate/content/common/common.ninja b/obj/components/translate/content/common/common.ninja index 36df95b..b6bd51c 100644 --- a/obj/components/translate/content/common/common.ninja +++ b/obj/components/translate/content/common/common.ninja @@ -9,8 +9,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/translate/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,6 @@ build obj/components/translate/content/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -382,4 +385,5 @@ build obj/components/translate/content/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/translate/content/renderer/renderer.ninja b/obj/components/translate/content/renderer/renderer.ninja index 2a29a2d..1e92bcd 100644 --- a/obj/components/translate/content/renderer/renderer.ninja +++ b/obj/components/translate/content/renderer/renderer.ninja @@ -9,6 +9,6 @@ target_output_name = renderer ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .lib ~ build obj/components/translate/content/renderer/renderer.inputdeps.stamp: ~ diff --git a/obj/components/translate/core/browser/browser.ninja b/obj/components/translate/core/browser/browser.ninja index ef45aa3..08482bf 100644 --- a/obj/components/translate/core/browser/browser.ninja +++ b/obj/components/translate/core/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/translate/core/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,5 @@ build obj/components/translate/core/browser/browser.inputdeps.stamp: ~ build obj/components/translate/core/browser/browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/translate/core/browser/unit_tests.ninja b/obj/components/translate/core/browser/unit_tests.ninja index 8c204ea..741b762 100644 --- a/obj/components/translate/core/browser/unit_tests.ninja +++ b/obj/components/translate/core/browser/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/translate/core/browser/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -56,4 +57,5 @@ build obj/components/translate/core/browser/unit_tests.inputdeps.stamp: ~ build obj/components/translate/core/browser/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/translate/core/common/common.ninja b/obj/components/translate/core/common/common.ninja index ec78435..6e75651 100644 --- a/obj/components/translate/core/common/common.ninja +++ b/obj/components/translate/core/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/translate/core/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/translate/core/common/common.inputdeps.stamp: ~ build obj/components/translate/core/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/translate/core/common/unit_tests.ninja b/obj/components/translate/core/common/unit_tests.ninja index 74ee99f..e682eb5 100644 --- a/obj/components/translate/core/common/unit_tests.ninja +++ b/obj/components/translate/core/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/translate/core/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/translate/core/common/unit_tests.inputdeps.stamp: ~ build obj/components/translate/core/common/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/translate/core/language_detection/language_detection.ninja b/obj/components/translate/core/language_detection/language_detection.ninja index 406a811..c8fa517 100644 --- a/obj/components/translate/core/language_detection/language_detection.ninja +++ b/obj/components/translate/core/language_detection/language_detection.ninja @@ -10,4 +10,5 @@ target_output_name = language_detection ~ build obj/components/translate/core/language_detection/language_detection.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/translate/core/language_detection/language_detection.inputd ~ build obj/components/translate/core/language_detection/language_detection.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/translate/core/language_detection/unit_tests.ninja b/obj/components/translate/core/language_detection/unit_tests.ninja index 304955c..cc409b4 100644 --- a/obj/components/translate/core/language_detection/unit_tests.ninja +++ b/obj/components/translate/core/language_detection/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/translate/core/language_detection/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/translate/core/language_detection/unit_tests.inputdeps.stam ~ build obj/components/translate/core/language_detection/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/ui/zoom/unit_tests.ninja b/obj/components/ui/zoom/unit_tests.ninja index 00909b6..c76a88b 100644 --- a/obj/components/ui/zoom/unit_tests.ninja +++ b/obj/components/ui/zoom/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/ui/zoom/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/ui/zoom/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/ui/zoom/zoom.ninja b/obj/components/ui/zoom/zoom.ninja index e9ba7c7..5239adb 100644 --- a/obj/components/ui/zoom/zoom.ninja +++ b/obj/components/ui/zoom/zoom.ninja @@ -10,4 +10,5 @@ target_output_name = zoom ~ build obj/components/ui/zoom/zoom.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/ui/zoom/zoom.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/undo/undo.ninja b/obj/components/undo/undo.ninja index 51597c0..b4a6177 100644 --- a/obj/components/undo/undo.ninja +++ b/obj/components/undo/undo.ninja @@ -9,8 +9,9 @@ target_output_name = undo ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/undo/undo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -61,4 +62,6 @@ build obj/components/undo/undo.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -190,4 +193,5 @@ build obj/components/undo/undo.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/undo/unit_tests.ninja b/obj/components/undo/unit_tests.ninja index 9b2656f..dd26a80 100644 --- a/obj/components/undo/unit_tests.ninja +++ b/obj/components/undo/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/undo/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/undo/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/update_client/test_support.ninja b/obj/components/update_client/test_support.ninja index 495127c..ba49fa2 100644 --- a/obj/components/update_client/test_support.ninja +++ b/obj/components/update_client/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/update_client/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/update_client/test_support.inputdeps.stamp: ~ build obj/components/update_client/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/update_client/unit_tests.ninja b/obj/components/update_client/unit_tests.ninja index 716d0b4..2b9ee3f 100644 --- a/obj/components/update_client/unit_tests.ninja +++ b/obj/components/update_client/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/update_client/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/components/update_client/unit_tests.inputdeps.stamp: ~ build obj/components/update_client/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/update_client/update_client.ninja b/obj/components/update_client/update_client.ninja index 75017f0..f097393 100644 --- a/obj/components/update_client/update_client.ninja +++ b/obj/components/update_client/update_client.ninja @@ -10,4 +10,5 @@ target_output_name = update_client ~ build obj/components/update_client/update_client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/components/update_client/update_client.inputdeps.stamp: ~ build obj/components/update_client/update_client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/upload_list/unit_tests.ninja b/obj/components/upload_list/unit_tests.ninja index 35f83fd..fec88f9 100644 --- a/obj/components/upload_list/unit_tests.ninja +++ b/obj/components/upload_list/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/upload_list/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/upload_list/unit_tests.inputdeps.stamp: ~ build obj/components/upload_list/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/upload_list/upload_list.ninja b/obj/components/upload_list/upload_list.ninja index bce6aff..9c5498f 100644 --- a/obj/components/upload_list/upload_list.ninja +++ b/obj/components/upload_list/upload_list.ninja @@ -10,4 +10,5 @@ target_output_name = upload_list ~ build obj/components/upload_list/upload_list.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/upload_list/upload_list.inputdeps.stamp: ~ build obj/components/upload_list/upload_list.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/url_formatter/unit_tests.ninja b/obj/components/url_formatter/unit_tests.ninja index 928f205..3da5ace 100644 --- a/obj/components/url_formatter/unit_tests.ninja +++ b/obj/components/url_formatter/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/url_formatter/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/url_formatter/unit_tests.inputdeps.stamp: ~ build obj/components/url_formatter/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/url_formatter/url_formatter.ninja b/obj/components/url_formatter/url_formatter.ninja index 4a7a560..0850ff5 100644 --- a/obj/components/url_formatter/url_formatter.ninja +++ b/obj/components/url_formatter/url_formatter.ninja @@ -10,4 +10,5 @@ target_output_name = url_formatter ~ build obj/components/url_formatter/url_formatter.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/url_formatter/url_formatter.inputdeps.stamp: ~ build obj/components/url_formatter/url_formatter.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/url_matcher/unit_tests.ninja b/obj/components/url_matcher/unit_tests.ninja index b8b761a..63b91dc 100644 --- a/obj/components/url_matcher/unit_tests.ninja +++ b/obj/components/url_matcher/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/url_matcher/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/url_matcher/unit_tests.inputdeps.stamp: ~ build obj/components/url_matcher/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/url_matcher/url_matcher.ninja b/obj/components/url_matcher/url_matcher.ninja index 446cc84..d6a6297 100644 --- a/obj/components/url_matcher/url_matcher.ninja +++ b/obj/components/url_matcher/url_matcher.ninja @@ -10,4 +10,5 @@ target_output_name = url_matcher ~ build obj/components/url_matcher/url_matcher.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/url_matcher/url_matcher.inputdeps.stamp: ~ build obj/components/url_matcher/url_matcher.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/user_manager/user_manager.ninja b/obj/components/user_manager/user_manager.ninja index 02f6688..28781d9 100644 --- a/obj/components/user_manager/user_manager.ninja +++ b/obj/components/user_manager/user_manager.ninja @@ -10,4 +10,5 @@ target_output_name = user_manager ~ build obj/components/user_manager/user_manager.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/components/user_manager/user_manager.inputdeps.stamp: ~ build obj/components/user_manager/user_manager.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/user_prefs/tracked/unit_tests.ninja b/obj/components/user_prefs/tracked/unit_tests.ninja index c9eab4d..7026ce7 100644 --- a/obj/components/user_prefs/tracked/unit_tests.ninja +++ b/obj/components/user_prefs/tracked/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/user_prefs/tracked/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/user_prefs/tracked/unit_tests.inputdeps.stamp: ~ build obj/components/user_prefs/tracked/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/user_prefs/tracked/user_prefs_tracked.ninja b/obj/components/user_prefs/tracked/user_prefs_tracked.ninja index 3ffa275..7f983c5 100644 --- a/obj/components/user_prefs/tracked/user_prefs_tracked.ninja +++ b/obj/components/user_prefs/tracked/user_prefs_tracked.ninja @@ -9,8 +9,9 @@ target_output_name = user_prefs_tracked ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/components/user_prefs/tracked/user_prefs_tracked.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -32,4 +33,6 @@ build obj/components/user_prefs/tracked/user_prefs_tracked.inputdeps.stamp: build obj/components/user_prefs/tracked/user_prefs_tracked.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -56,4 +59,5 @@ build obj/components/user_prefs/tracked/user_prefs_tracked.lib: obj/third_party/boringssl/boringssl_asm.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/user_prefs/tracked/user_prefs_tracked_test_support.ninja b/obj/components/user_prefs/tracked/user_prefs_tracked_test_support.ninja index 55a8315..cf0a56c 100644 --- a/obj/components/user_prefs/tracked/user_prefs_tracked_test_support.ninja +++ b/obj/components/user_prefs/tracked/user_prefs_tracked_test_support.ninja @@ -10,4 +10,5 @@ target_output_name = user_prefs_tracked_test_support ~ build obj/components/user_prefs/tracked/user_prefs_tracked_test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/user_prefs/tracked/user_prefs_tracked_test_support.inputdep ~ build obj/components/user_prefs/tracked/user_prefs_tracked_test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/user_prefs/user_prefs.ninja b/obj/components/user_prefs/user_prefs.ninja index a2df62e..4e1cde6 100644 --- a/obj/components/user_prefs/user_prefs.ninja +++ b/obj/components/user_prefs/user_prefs.ninja @@ -10,4 +10,5 @@ target_output_name = user_prefs ~ build obj/components/user_prefs/user_prefs.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/user_prefs/user_prefs.inputdeps.stamp: ~ build obj/components/user_prefs/user_prefs.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/variations/net/net.ninja b/obj/components/variations/net/net.ninja index 526de75..7e46bd4 100644 --- a/obj/components/variations/net/net.ninja +++ b/obj/components/variations/net/net.ninja @@ -10,4 +10,5 @@ target_output_name = net ~ build obj/components/variations/net/net.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/variations/net/net.inputdeps.stamp: ~ build obj/components/variations/net/net.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/variations/service/service.ninja b/obj/components/variations/service/service.ninja index ccd2d61..38bacb1 100644 --- a/obj/components/variations/service/service.ninja +++ b/obj/components/variations/service/service.ninja @@ -10,4 +10,5 @@ target_output_name = service ~ build obj/components/variations/service/service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/components/variations/service/service.inputdeps.stamp: ~ build obj/components/variations/service/service.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/variations/service/unit_tests.ninja b/obj/components/variations/service/unit_tests.ninja index a136d36..4bf1d97 100644 --- a/obj/components/variations/service/unit_tests.ninja +++ b/obj/components/variations/service/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/variations/service/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/components/variations/service/unit_tests.inputdeps.stamp: ~ build obj/components/variations/service/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/variations/unit_tests.ninja b/obj/components/variations/unit_tests.ninja index 6af1db3..b1ab23e 100644 --- a/obj/components/variations/unit_tests.ninja +++ b/obj/components/variations/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/variations/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/components/variations/unit_tests.inputdeps.stamp: ~ build obj/components/variations/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/variations/variations.ninja b/obj/components/variations/variations.ninja index bd74f17..c3aff4e 100644 --- a/obj/components/variations/variations.ninja +++ b/obj/components/variations/variations.ninja @@ -10,4 +10,5 @@ target_output_name = variations ~ build obj/components/variations/variations.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/variations/variations.inputdeps.stamp: ~ build obj/components/variations/variations.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/version_info/version_info.ninja b/obj/components/version_info/version_info.ninja index 12cd38f..c81db79 100644 --- a/obj/components/version_info/version_info.ninja +++ b/obj/components/version_info/version_info.ninja @@ -10,4 +10,5 @@ target_output_name = version_info ~ build obj/components/version_info/version_info.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/components/version_info/version_info.inputdeps.stamp: ~ build obj/components/version_info/version_info.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/version_ui/version_ui.ninja b/obj/components/version_ui/version_ui.ninja index 7aa4e2b..8341947 100644 --- a/obj/components/version_ui/version_ui.ninja +++ b/obj/components/version_ui/version_ui.ninja @@ -10,4 +10,5 @@ target_output_name = version_ui ~ build obj/components/version_ui/version_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/version_ui/version_ui.inputdeps.stamp: ~ build obj/components/version_ui/version_ui.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/visitedlink/browser/browser.ninja b/obj/components/visitedlink/browser/browser.ninja index a1d5f4f..d16ed2f 100644 --- a/obj/components/visitedlink/browser/browser.ninja +++ b/obj/components/visitedlink/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/visitedlink/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/visitedlink/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/visitedlink/common/common.ninja b/obj/components/visitedlink/common/common.ninja index c6b6db5..d165890 100644 --- a/obj/components/visitedlink/common/common.ninja +++ b/obj/components/visitedlink/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/visitedlink/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/components/visitedlink/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/wallpaper/unit_tests.ninja b/obj/components/wallpaper/unit_tests.ninja index 466d2e2..e406bce 100644 --- a/obj/components/wallpaper/unit_tests.ninja +++ b/obj/components/wallpaper/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/wallpaper/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/components/wallpaper/unit_tests.inputdeps.stamp: ~ build obj/components/wallpaper/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/wallpaper/wallpaper.ninja b/obj/components/wallpaper/wallpaper.ninja index 25f2cf7..f9cd6d7 100644 --- a/obj/components/wallpaper/wallpaper.ninja +++ b/obj/components/wallpaper/wallpaper.ninja @@ -10,4 +10,5 @@ target_output_name = wallpaper ~ build obj/components/wallpaper/wallpaper.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/components/wallpaper/wallpaper.inputdeps.stamp: ~ build obj/components/wallpaper/wallpaper.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_cache/browser/browser.ninja b/obj/components/web_cache/browser/browser.ninja index 292b6c0..366d0a7 100644 --- a/obj/components/web_cache/browser/browser.ninja +++ b/obj/components/web_cache/browser/browser.ninja @@ -10,4 +10,5 @@ target_output_name = browser ~ build obj/components/web_cache/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/components/web_cache/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_cache/common/common.ninja b/obj/components/web_cache/common/common.ninja index e787a47..90fc021 100644 --- a/obj/components/web_cache/common/common.ninja +++ b/obj/components/web_cache/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/components/web_cache/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/components/web_cache/common/common.inputdeps.stamp: ~ build obj/components/web_cache/common/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/web_modal/test_support.ninja b/obj/components/web_modal/test_support.ninja index 8f7715c..f68bd0f 100644 --- a/obj/components/web_modal/test_support.ninja +++ b/obj/components/web_modal/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/web_modal/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/components/web_modal/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -484,4 +487,5 @@ build obj/components/web_modal/test_support.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/web_modal/web_modal.ninja b/obj/components/web_modal/web_modal.ninja index 6d5e944..00ce982 100644 --- a/obj/components/web_modal/web_modal.ninja +++ b/obj/components/web_modal/web_modal.ninja @@ -9,8 +9,9 @@ target_output_name = web_modal ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/components/web_modal/web_modal.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/components/web_modal/web_modal.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -486,4 +489,5 @@ build obj/components/web_modal/web_modal.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/web_resource/test_support.ninja b/obj/components/web_resource/test_support.ninja index a714776..a985a82 100644 --- a/obj/components/web_resource/test_support.ninja +++ b/obj/components/web_resource/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/components/web_resource/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -49,4 +50,6 @@ build obj/components/web_resource/test_support.inputdeps.stamp: build obj/components/web_resource/test_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -113,4 +116,5 @@ build obj/components/web_resource/test_support.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/web_resource/unit_tests.ninja b/obj/components/web_resource/unit_tests.ninja index d2fbef9..425c6f9 100644 --- a/obj/components/web_resource/unit_tests.ninja +++ b/obj/components/web_resource/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/web_resource/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/web_resource/unit_tests.inputdeps.stamp: ~ build obj/components/web_resource/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_resource/web_resource.ninja b/obj/components/web_resource/web_resource.ninja index ce381c9..a7d1a31 100644 --- a/obj/components/web_resource/web_resource.ninja +++ b/obj/components/web_resource/web_resource.ninja @@ -9,8 +9,9 @@ target_output_name = web_resource ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/components/web_resource/web_resource.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -49,4 +50,6 @@ build obj/components/web_resource/web_resource.inputdeps.stamp: build obj/components/web_resource/web_resource.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -118,4 +121,5 @@ build obj/components/web_resource/web_resource.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/web_view/apptests.ninja b/obj/components/web_view/apptests.ninja index 88dbb56..5daa497 100644 --- a/obj/components/web_view/apptests.ninja +++ b/obj/components/web_view/apptests.ninja @@ -1,4 +1,5 @@ ~ build obj/components/web_view/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/lib.ninja b/obj/components/web_view/lib.ninja index 93d9779..e8f75d1 100644 --- a/obj/components/web_view/lib.ninja +++ b/obj/components/web_view/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/components/web_view/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -60,4 +61,5 @@ build obj/components/web_view/lib.inputdeps.stamp: ~ build obj/components/web_view/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_view/public/cpp/cpp.ninja b/obj/components/web_view/public/cpp/cpp.ninja index a601243..9616c13 100644 --- a/obj/components/web_view/public/cpp/cpp.ninja +++ b/obj/components/web_view/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/components/web_view/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/components/web_view/public/cpp/cpp.inputdeps.stamp: ~ build obj/components/web_view/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_view/public/interfaces/interfaces.ninja b/obj/components/web_view/public/interfaces/interfaces.ninja index 9205809..e080ba3 100644 --- a/obj/components/web_view/public/interfaces/interfaces.ninja +++ b/obj/components/web_view/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/web_view/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/components/web_view/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/web_view/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/web_view/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/web_view/public/interfaces/interfaces_cpp_sources.ninja index 6b6ece6..d97c1b3 100644 --- a/obj/components/web_view/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/web_view/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/web_view/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,5 @@ build obj/components/web_view/public/interfaces/interfaces_cpp_sources.inputdeps ~ build obj/components/web_view/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/web_view/test_runner/public/interfaces/interfaces.ninja b/obj/components/web_view/test_runner/public/interfaces/interfaces.ninja index cec69c2..f409955 100644 --- a/obj/components/web_view/test_runner/public/interfaces/interfaces.ninja +++ b/obj/components/web_view/test_runner/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/web_view/test_runner/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/components/web_view/test_runner/public/interfaces/interfaces.inputdeps ~ build obj/components/web_view/test_runner/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.ninja index ac1ca53..d62872d 100644 --- a/obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sourc ~ build obj/components/web_view/test_runner/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/web_view/test_runner/test_runner.ninja b/obj/components/web_view/test_runner/test_runner.ninja index ad5b6d7..f944dda 100644 --- a/obj/components/web_view/test_runner/test_runner.ninja +++ b/obj/components/web_view/test_runner/test_runner.ninja @@ -9,10 +9,13 @@ target_output_name = layout_test_runner ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./layout_test_runner.exe: ~ ./image_diff.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3681,7 +3684,9 @@ build ./layout_test_runner.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/components/web_view/test_runner/test_runner.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/test_runner/web_view_test_runner.ninja b/obj/components/web_view/test_runner/web_view_test_runner.ninja index fb914df..071e349 100644 --- a/obj/components/web_view/test_runner/web_view_test_runner.ninja +++ b/obj/components/web_view/test_runner/web_view_test_runner.ninja @@ -1,4 +1,5 @@ ~ build obj/components/web_view/test_runner/web_view_test_runner.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/test_runner/web_view_test_runner_library.ninja b/obj/components/web_view/test_runner/web_view_test_runner_library.ninja index c5619b9..3089b49 100644 --- a/obj/components/web_view/test_runner/web_view_test_runner_library.ninja +++ b/obj/components/web_view/test_runner/web_view_test_runner_library.ninja @@ -9,9 +9,12 @@ target_output_name = web_view_test_runner_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./web_view_test_runner_library.dll ./web_view_test_runner_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7371,7 +7374,9 @@ build ./web_view_test_runner_library.dll ./web_view_test_runner_library.dll.lib: obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/components/web_view/test_runner/web_view_test_runner_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/test_support.ninja b/obj/components/web_view/test_support.ninja index 0e4f9d1..a3244f0 100644 --- a/obj/components/web_view/test_support.ninja +++ b/obj/components/web_view/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/web_view/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -60,4 +61,5 @@ build obj/components/web_view/test_support.inputdeps.stamp: ~ build obj/components/web_view/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/web_view/web_view.ninja b/obj/components/web_view/web_view.ninja index cd656e1..7b94214 100644 --- a/obj/components/web_view/web_view.ninja +++ b/obj/components/web_view/web_view.ninja @@ -1,4 +1,5 @@ ~ build obj/components/web_view/web_view.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/web_view_apptests_library.ninja b/obj/components/web_view/web_view_apptests_library.ninja index 25eeebe..c1fca2d 100644 --- a/obj/components/web_view/web_view_apptests_library.ninja +++ b/obj/components/web_view/web_view_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = web_view_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./web_view_apptests_library.dll ./web_view_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3677,7 +3680,9 @@ build ./web_view_apptests_library.dll ./web_view_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/web_view/web_view_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/web_view/web_view_library.ninja b/obj/components/web_view/web_view_library.ninja index 74cf76b..c5ebead 100644 --- a/obj/components/web_view/web_view_library.ninja +++ b/obj/components/web_view/web_view_library.ninja @@ -9,9 +9,12 @@ target_output_name = web_view_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./web_view_library.dll ./web_view_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3615,7 +3618,9 @@ build ./web_view_library.dll ./web_view_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/components/web_view/web_view_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/components/webcrypto/unit_tests.ninja b/obj/components/webcrypto/unit_tests.ninja index 2054d8e..60c2f17 100644 --- a/obj/components/webcrypto/unit_tests.ninja +++ b/obj/components/webcrypto/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/webcrypto/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -123,4 +124,5 @@ build obj/components/webcrypto/unit_tests.inputdeps.stamp: ~ build obj/components/webcrypto/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/webcrypto/webcrypto.ninja b/obj/components/webcrypto/webcrypto.ninja index 40307c2..26a0219 100644 --- a/obj/components/webcrypto/webcrypto.ninja +++ b/obj/components/webcrypto/webcrypto.ninja @@ -10,4 +10,5 @@ target_output_name = webcrypto ~ build obj/components/webcrypto/webcrypto.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/components/webcrypto/webcrypto.inputdeps.stamp: ~ build obj/components/webcrypto/webcrypto.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/webdata/common/common.ninja b/obj/components/webdata/common/common.ninja index 1e39ccb..debdf3b 100644 --- a/obj/components/webdata/common/common.ninja +++ b/obj/components/webdata/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = webdata_common ~ build obj/components/webdata/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,5 @@ build obj/components/webdata/common/common/webdata_constants.obj: ~ build obj/components/webdata/common/webdata_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/webdata/common/unit_tests.ninja b/obj/components/webdata/common/unit_tests.ninja index bc5e285..9632fb7 100644 --- a/obj/components/webdata/common/unit_tests.ninja +++ b/obj/components/webdata/common/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/webdata/common/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -75,4 +76,5 @@ build obj/components/webdata/common/unit_tests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/webdata_services/test_support.ninja b/obj/components/webdata_services/test_support.ninja index c26c96f..c08d45b 100644 --- a/obj/components/webdata_services/test_support.ninja +++ b/obj/components/webdata_services/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/webdata_services/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -75,4 +76,5 @@ build obj/components/webdata_services/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/webdata_services/webdata_services.ninja b/obj/components/webdata_services/webdata_services.ninja index 4aedc84..47260e3 100644 --- a/obj/components/webdata_services/webdata_services.ninja +++ b/obj/components/webdata_services/webdata_services.ninja @@ -9,8 +9,9 @@ target_output_name = webdata_services ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/components/webdata_services/webdata_services.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -79,4 +80,6 @@ build obj/components/webdata_services/webdata_services.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -271,4 +274,5 @@ build obj/components/webdata_services/webdata_services.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/components/webusb/public/interfaces/interfaces.ninja b/obj/components/webusb/public/interfaces/interfaces.ninja index 098744a..c5fc500 100644 --- a/obj/components/webusb/public/interfaces/interfaces.ninja +++ b/obj/components/webusb/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/components/webusb/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/components/webusb/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/components/webusb/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/webusb/public/interfaces/interfaces_cpp_sources.ninja b/obj/components/webusb/public/interfaces/interfaces_cpp_sources.ninja index cb79cb4..8103128 100644 --- a/obj/components/webusb/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/components/webusb/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/components/webusb/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/components/webusb/public/interfaces/interfaces_cpp_sources.inputdeps.s ~ build obj/components/webusb/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/webusb/unit_tests.ninja b/obj/components/webusb/unit_tests.ninja index 8576d60..d8a3198 100644 --- a/obj/components/webusb/unit_tests.ninja +++ b/obj/components/webusb/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/components/webusb/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/components/webusb/unit_tests.inputdeps.stamp: ~ build obj/components/webusb/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/webusb/webusb.ninja b/obj/components/webusb/webusb.ninja index 898ded7..817daa9 100644 --- a/obj/components/webusb/webusb.ninja +++ b/obj/components/webusb/webusb.ninja @@ -10,4 +10,5 @@ target_output_name = webusb ~ build obj/components/webusb/webusb.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/components/webusb/webusb.inputdeps.stamp: ~ build obj/components/webusb/webusb.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/components/wifi/test_support.ninja b/obj/components/wifi/test_support.ninja index 6b18179..7f68d1f 100644 --- a/obj/components/wifi/test_support.ninja +++ b/obj/components/wifi/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/components/wifi/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/wifi/test_support.inputdeps.stamp: ~ build obj/components/wifi/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/wifi/wifi.ninja b/obj/components/wifi/wifi.ninja index 6606ced..6ffe44a 100644 --- a/obj/components/wifi/wifi.ninja +++ b/obj/components/wifi/wifi.ninja @@ -10,4 +10,5 @@ target_output_name = wifi ~ build obj/components/wifi/wifi.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/components/wifi/wifi.inputdeps.stamp: ~ build obj/components/wifi/wifi.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/components/wifi/wifi_test.ninja b/obj/components/wifi/wifi_test.ninja index 8c9680a..d91af0f 100644 --- a/obj/components/wifi/wifi_test.ninja +++ b/obj/components/wifi/wifi_test.ninja @@ -9,9 +9,12 @@ target_output_name = wifi_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib iphlpapi.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./wifi_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -548,7 +551,9 @@ build ./wifi_test.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/components/wifi/wifi_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/content/browser/browser.ninja b/obj/content/browser/browser.ninja index 6f8f2f7..918266a 100644 --- a/obj/content/browser/browser.ninja +++ b/obj/content/browser/browser.ninja @@ -12,4 +12,5 @@ target_output_name = browser ~ build obj/content/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -176,4 +177,5 @@ build obj/content/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/child/child.ninja b/obj/content/child/child.ninja index 61aef41..ec07a73 100644 --- a/obj/content/child/child.ninja +++ b/obj/content/child/child.ninja @@ -12,4 +12,5 @@ target_output_name = child ~ build obj/content/child/child.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -137,4 +138,5 @@ build obj/content/child/child.inputdeps.stamp: ~ build obj/content/child/child.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/common/common.ninja b/obj/content/common/common.ninja index 7808f4a..fef05f8 100644 --- a/obj/content/common/common.ninja +++ b/obj/content/common/common.ninja @@ -12,4 +12,5 @@ target_output_name = common ~ build obj/content/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -143,4 +144,5 @@ build obj/content/common/common.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/common/mojo_bindings.ninja b/obj/content/common/mojo_bindings.ninja index b4ff21c..97e4bae 100644 --- a/obj/content/common/mojo_bindings.ninja +++ b/obj/content/common/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/content/common/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,5 @@ build obj/content/common/mojo_bindings.inputdeps.stamp: ~ build obj/content/common/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/common/mojo_bindings_cpp_sources.ninja b/obj/content/common/mojo_bindings_cpp_sources.ninja index c531cc6..314075e 100644 --- a/obj/content/common/mojo_bindings_cpp_sources.ninja +++ b/obj/content/common/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/content/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -24,4 +25,5 @@ build obj/content/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/content/common/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/gpu/gpu_sources.ninja b/obj/content/gpu/gpu_sources.ninja index a595e51..b54d876 100644 --- a/obj/content/gpu/gpu_sources.ninja +++ b/obj/content/gpu/gpu_sources.ninja @@ -10,4 +10,5 @@ target_output_name = gpu_sources ~ build obj/content/gpu/gpu_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,5 @@ build obj/content/gpu/gpu_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/plugin/plugin.ninja b/obj/content/plugin/plugin.ninja index c7e31c6..5d065bb 100644 --- a/obj/content/plugin/plugin.ninja +++ b/obj/content/plugin/plugin.ninja @@ -10,4 +10,5 @@ target_output_name = plugin ~ build obj/content/plugin/plugin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -141,4 +142,5 @@ build obj/content/plugin/plugin.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/ppapi_plugin/ppapi_plugin_sources.ninja b/obj/content/ppapi_plugin/ppapi_plugin_sources.ninja index 73f7a2d..075ddc7 100644 --- a/obj/content/ppapi_plugin/ppapi_plugin_sources.ninja +++ b/obj/content/ppapi_plugin/ppapi_plugin_sources.ninja @@ -10,4 +10,5 @@ target_output_name = ppapi_plugin_sources ~ build obj/content/ppapi_plugin/ppapi_plugin_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,5 @@ build obj/content/ppapi_plugin/ppapi_plugin_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/public/browser/browser_sources.ninja b/obj/content/public/browser/browser_sources.ninja index 9b4a1a3..36d161b 100644 --- a/obj/content/public/browser/browser_sources.ninja +++ b/obj/content/public/browser/browser_sources.ninja @@ -12,4 +12,5 @@ target_output_name = browser_sources ~ build obj/content/public/browser/browser_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -176,4 +177,5 @@ build obj/content/public/browser/browser_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/public/child/child_sources.ninja b/obj/content/public/child/child_sources.ninja index b1de387..2ab70a9 100644 --- a/obj/content/public/child/child_sources.ninja +++ b/obj/content/public/child/child_sources.ninja @@ -10,4 +10,5 @@ target_output_name = child_sources ~ build obj/content/public/child/child_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -145,4 +146,5 @@ build obj/content/public/child/child_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/public/common/common_sources.ninja b/obj/content/public/common/common_sources.ninja index e17ba7a..6e08e2d 100644 --- a/obj/content/public/common/common_sources.ninja +++ b/obj/content/public/common/common_sources.ninja @@ -12,4 +12,5 @@ target_output_name = common_sources ~ build obj/content/public/common/common_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -143,4 +144,5 @@ build obj/content/public/common/common_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/public/common/mojo_bindings.ninja b/obj/content/public/common/mojo_bindings.ninja index abb5747..bf055c2 100644 --- a/obj/content/public/common/mojo_bindings.ninja +++ b/obj/content/public/common/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/content/public/common/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/content/public/common/mojo_bindings.inputdeps.stamp: ~ build obj/content/public/common/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/public/common/mojo_bindings_cpp_sources.ninja b/obj/content/public/common/mojo_bindings_cpp_sources.ninja index 86fa5c3..51f6850 100644 --- a/obj/content/public/common/mojo_bindings_cpp_sources.ninja +++ b/obj/content/public/common/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/content/public/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/content/public/common/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/content/public/common/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/public/plugin/plugin_sources.ninja b/obj/content/public/plugin/plugin_sources.ninja index f331048..8221cc9 100644 --- a/obj/content/public/plugin/plugin_sources.ninja +++ b/obj/content/public/plugin/plugin_sources.ninja @@ -8,4 +8,5 @@ target_output_name = plugin_sources ~ build obj/content/public/plugin/plugin_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -139,4 +140,5 @@ build obj/content/public/plugin/plugin_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/public/utility/utility_sources.ninja b/obj/content/public/utility/utility_sources.ninja index 479a420..4366a90 100644 --- a/obj/content/public/utility/utility_sources.ninja +++ b/obj/content/public/utility/utility_sources.ninja @@ -10,4 +10,5 @@ target_output_name = utility_sources ~ build obj/content/public/utility/utility_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -146,4 +147,5 @@ build obj/content/public/utility/utility_sources.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/renderer/mus/mus.ninja b/obj/content/renderer/mus/mus.ninja index dd4bad5..f4659ee 100644 --- a/obj/content/renderer/mus/mus.ninja +++ b/obj/content/renderer/mus/mus.ninja @@ -10,4 +10,5 @@ target_output_name = mus ~ build obj/content/renderer/mus/mus.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -131,4 +132,5 @@ build obj/content/renderer/mus/mus.inputdeps.stamp: ~ build obj/content/renderer/mus/mus.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/content/sandbox_helper_win.ninja b/obj/content/sandbox_helper_win.ninja index b801875..7a1eefc 100644 --- a/obj/content/sandbox_helper_win.ninja +++ b/obj/content/sandbox_helper_win.ninja @@ -10,4 +10,5 @@ target_output_name = sandbox_helper_win ~ build obj/content/sandbox_helper_win.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/content/sandbox_helper_win.inputdeps.stamp: ~ build obj/content/sandbox_helper_win.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/shell/content_shell.ninja b/obj/content/shell/content_shell.ninja index a0cca61..e1afa2f 100644 --- a/obj/content/shell/content_shell.ninja +++ b/obj/content/shell/content_shell.ninja @@ -9,5 +9,5 @@ target_output_name = content_shell ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/content/shell/content_shell_crash_service.ninja b/obj/content/shell/content_shell_crash_service.ninja index 8a5f721..af78ed7 100644 --- a/obj/content/shell/content_shell_crash_service.ninja +++ b/obj/content/shell/content_shell_crash_service.ninja @@ -9,9 +9,12 @@ target_output_name = content_shell_crash_service ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./content_shell_crash_service.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -34,7 +37,9 @@ build ./content_shell_crash_service.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/content/shell/content_shell_crash_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/content/shell/content_shell_lib.ninja b/obj/content/shell/content_shell_lib.ninja index 1b41af6..cecd282 100644 --- a/obj/content/shell/content_shell_lib.ninja +++ b/obj/content/shell/content_shell_lib.ninja @@ -11,5 +11,5 @@ target_output_name = content_shell_lib ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ diff --git a/obj/content/test/content_browsertests.ninja b/obj/content/test/content_browsertests.ninja index 70b0152..6c217b0 100644 --- a/obj/content/test/content_browsertests.ninja +++ b/obj/content/test/content_browsertests.ninja @@ -11,5 +11,5 @@ target_output_name = content_browsertests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = oleacc.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/content/test/content_gl_benchmark.ninja b/obj/content/test/content_gl_benchmark.ninja index 46e92f0..ea35c8c 100644 --- a/obj/content/test/content_gl_benchmark.ninja +++ b/obj/content/test/content_gl_benchmark.ninja @@ -9,5 +9,5 @@ target_output_name = content_gl_benchmark ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/content/test/content_gl_tests.ninja b/obj/content/test/content_gl_tests.ninja index dc901dd..33e5be7 100644 --- a/obj/content/test/content_gl_tests.ninja +++ b/obj/content/test/content_gl_tests.ninja @@ -9,5 +9,5 @@ target_output_name = content_gl_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/content/test/content_perftests.ninja b/obj/content/test/content_perftests.ninja index a008085..1beb868 100644 --- a/obj/content/test/content_perftests.ninja +++ b/obj/content/test/content_perftests.ninja @@ -9,5 +9,5 @@ target_output_name = content_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/content/test/content_test_mojo_bindings.ninja b/obj/content/test/content_test_mojo_bindings.ninja index f467cd8..0f73d3a 100644 --- a/obj/content/test/content_test_mojo_bindings.ninja +++ b/obj/content/test/content_test_mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = content_test_mojo_bindings ~ build obj/content/test/content_test_mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/content/test/content_test_mojo_bindings.inputdeps.stamp: ~ build obj/content/test/content_test_mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/test/content_test_mojo_bindings_cpp_sources.ninja b/obj/content/test/content_test_mojo_bindings_cpp_sources.ninja index 3bba8ea..eef43a3 100644 --- a/obj/content/test/content_test_mojo_bindings_cpp_sources.ninja +++ b/obj/content/test/content_test_mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = content_test_mojo_bindings_cpp_sources ~ build obj/content/test/content_test_mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/content/test/content_test_mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/content/test/content_test_mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/test/content_unittests.ninja b/obj/content/test/content_unittests.ninja index 62a7579..f894ed1 100644 --- a/obj/content/test/content_unittests.ninja +++ b/obj/content/test/content_unittests.ninja @@ -11,5 +11,5 @@ target_output_name = content_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/content/test/layouttest_support.ninja b/obj/content/test/layouttest_support.ninja index 22bf499..b44580f 100644 --- a/obj/content/test/layouttest_support.ninja +++ b/obj/content/test/layouttest_support.ninja @@ -9,6 +9,6 @@ target_output_name = layouttest_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib -gen/base/allocator/allocator/libcmt.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .lib ~ build obj/content/test/layouttest_support.inputdeps.stamp: ~ diff --git a/obj/content/test/web_ui_test_mojo_bindings.ninja b/obj/content/test/web_ui_test_mojo_bindings.ninja index 1eebede..dfbada4 100644 --- a/obj/content/test/web_ui_test_mojo_bindings.ninja +++ b/obj/content/test/web_ui_test_mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = web_ui_test_mojo_bindings ~ build obj/content/test/web_ui_test_mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/content/test/web_ui_test_mojo_bindings.inputdeps.stamp: ~ build obj/content/test/web_ui_test_mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/test/web_ui_test_mojo_bindings_cpp_sources.ninja b/obj/content/test/web_ui_test_mojo_bindings_cpp_sources.ninja index 4a83648..84d3f29 100644 --- a/obj/content/test/web_ui_test_mojo_bindings_cpp_sources.ninja +++ b/obj/content/test/web_ui_test_mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = web_ui_test_mojo_bindings_cpp_sources ~ build obj/content/test/web_ui_test_mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/content/test/web_ui_test_mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/content/test/web_ui_test_mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/content/utility/utility.ninja b/obj/content/utility/utility.ninja index 8869d02..d58ae8b 100644 --- a/obj/content/utility/utility.ninja +++ b/obj/content/utility/utility.ninja @@ -10,4 +10,5 @@ target_output_name = utility ~ build obj/content/utility/utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -146,4 +147,5 @@ build obj/content/utility/utility.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/courgette/courgette.ninja b/obj/courgette/courgette.ninja index a6b5a94..316a5fd 100644 --- a/obj/courgette/courgette.ninja +++ b/obj/courgette/courgette.ninja @@ -9,9 +9,12 @@ target_output_name = courgette64 ~ ~ ldflags = /LARGEADDRESSAWARE /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./courgette64.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -24,7 +27,9 @@ build ./courgette64.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/courgette/courgette.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/courgette/courgette_fuzz.ninja b/obj/courgette/courgette_fuzz.ninja index 0be38ac..2ca9121 100644 --- a/obj/courgette/courgette_fuzz.ninja +++ b/obj/courgette/courgette_fuzz.ninja @@ -9,9 +9,12 @@ target_output_name = courgette_fuzz ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./courgette_fuzz.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -461,7 +464,9 @@ build ./courgette_fuzz.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/courgette/courgette_fuzz.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/courgette/courgette_lib.ninja b/obj/courgette/courgette_lib.ninja index 8211a86..e742c7e 100644 --- a/obj/courgette/courgette_lib.ninja +++ b/obj/courgette/courgette_lib.ninja @@ -9,8 +9,9 @@ target_output_name = courgette_lib ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/courgette/courgette_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/courgette/courgette_lib.inputdeps.stamp: build obj/courgette/courgette_lib.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -47,4 +50,5 @@ build obj/courgette/courgette_lib.lib: obj/third_party/lzma_sdk/lzma_sdk.lib ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/courgette/courgette_minimal_tool.ninja b/obj/courgette/courgette_minimal_tool.ninja index 36bbd34..49d1a78 100644 --- a/obj/courgette/courgette_minimal_tool.ninja +++ b/obj/courgette/courgette_minimal_tool.ninja @@ -9,9 +9,12 @@ target_output_name = courgette_minimal_tool ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./courgette_minimal_tool.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -24,7 +27,9 @@ build ./courgette_minimal_tool.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/courgette/courgette_minimal_tool.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/crypto/crypto.ninja b/obj/crypto/crypto.ninja index d6b28d7..38cb082 100644 --- a/obj/crypto/crypto.ninja +++ b/obj/crypto/crypto.ninja @@ -10,4 +10,5 @@ target_output_name = crcrypto ~ build obj/crypto/crcrypto.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -49,4 +50,5 @@ build obj/crypto/crcrypto.stamp: ~ build obj/crypto/crypto.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/crypto/crypto_unittests.ninja b/obj/crypto/crypto_unittests.ninja index df66f60..5059650 100644 --- a/obj/crypto/crypto_unittests.ninja +++ b/obj/crypto/crypto_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = crypto_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./crypto_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -819,7 +822,9 @@ build ./crypto_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/crypto/crypto_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/crypto/test_support.ninja b/obj/crypto/test_support.ninja index 7e6cba0..7204948 100644 --- a/obj/crypto/test_support.ninja +++ b/obj/crypto/test_support.ninja @@ -8,4 +8,5 @@ target_output_name = test_support ~ build obj/crypto/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -26,4 +27,5 @@ build obj/crypto/test_support.inputdeps.stamp: ~ build obj/crypto/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/battery/battery.ninja b/obj/device/battery/battery.ninja index 0d0a81c..7236a9b 100644 --- a/obj/device/battery/battery.ninja +++ b/obj/device/battery/battery.ninja @@ -10,4 +10,5 @@ target_output_name = device_battery ~ build obj/device/battery/battery.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/device/battery/battery/battery_status_service.obj: ~ build obj/device/battery/device_battery.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/battery/mojo_bindings.ninja b/obj/device/battery/mojo_bindings.ninja index 6815d52..a4c700b 100644 --- a/obj/device/battery/mojo_bindings.ninja +++ b/obj/device/battery/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/device/battery/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/battery/mojo_bindings.inputdeps.stamp: ~ build obj/device/battery/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/battery/mojo_bindings_cpp_sources.ninja b/obj/device/battery/mojo_bindings_cpp_sources.ninja index 832c47d..b11bda9 100644 --- a/obj/device/battery/mojo_bindings_cpp_sources.ninja +++ b/obj/device/battery/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/device/battery/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/device/battery/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/device/battery/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/bluetooth/bluetooth.ninja b/obj/device/bluetooth/bluetooth.ninja index 7716105..33313ce 100644 --- a/obj/device/bluetooth/bluetooth.ninja +++ b/obj/device/bluetooth/bluetooth.ninja @@ -10,4 +10,5 @@ target_output_name = bluetooth ~ build obj/device/bluetooth/bluetooth.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -42,4 +43,5 @@ build obj/device/bluetooth/bluetooth.inputdeps.stamp: ~ build obj/device/bluetooth/bluetooth.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/bluetooth/mocks.ninja b/obj/device/bluetooth/mocks.ninja index 74c2b27..c8511a5 100644 --- a/obj/device/bluetooth/mocks.ninja +++ b/obj/device/bluetooth/mocks.ninja @@ -9,8 +9,9 @@ target_output_name = mocks ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib setupapi.lib cfgmgr32.lib netapi32.lib powrprof.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .lib ~ build obj/device/bluetooth/mocks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,6 @@ build obj/device/bluetooth/mocks.inputdeps.stamp: build obj/device/bluetooth/mocks.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -112,4 +115,5 @@ build obj/device/bluetooth/mocks.lib: obj/ui/strings/ui_strings.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/device/bluetooth/uribeacon/uribeacon.ninja b/obj/device/bluetooth/uribeacon/uribeacon.ninja index 1146743..917c15d 100644 --- a/obj/device/bluetooth/uribeacon/uribeacon.ninja +++ b/obj/device/bluetooth/uribeacon/uribeacon.ninja @@ -10,4 +10,5 @@ target_output_name = uribeacon ~ build obj/device/bluetooth/uribeacon/uribeacon.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/bluetooth/uribeacon/uribeacon.inputdeps.stamp: ~ build obj/device/bluetooth/uribeacon/uribeacon.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/core/core.ninja b/obj/device/core/core.ninja index 8c2107a..4bdb085 100644 --- a/obj/device/core/core.ninja +++ b/obj/device/core/core.ninja @@ -10,4 +10,5 @@ target_output_name = device_core ~ build obj/device/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -33,4 +34,5 @@ build obj/device/core/core/device_monitor_win.obj: ~ build obj/device/core/device_core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/core/mocks.ninja b/obj/device/core/mocks.ninja index 429d757..f2feaf4 100644 --- a/obj/device/core/mocks.ninja +++ b/obj/device/core/mocks.ninja @@ -10,4 +10,5 @@ target_output_name = mocks ~ build obj/device/core/mocks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/device/core/mocks.inputdeps.stamp: ~ build obj/device/core/mocks.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/device_unittests.ninja b/obj/device/device_unittests.ninja index 60c8257..c33f72d 100644 --- a/obj/device/device_unittests.ninja +++ b/obj/device/device_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = device_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./device_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2624,7 +2627,9 @@ build ./device_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/device/device_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/devices_app/apptests.ninja b/obj/device/devices_app/apptests.ninja index 846fd13..d9987cc 100644 --- a/obj/device/devices_app/apptests.ninja +++ b/obj/device/devices_app/apptests.ninja @@ -7,4 +7,5 @@ build devices_apptests/devices_apptests.mojo: ~ build obj/device/devices_app/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/devices_app/devices.ninja b/obj/device/devices_app/devices.ninja index d50e1e1..de19854 100644 --- a/obj/device/devices_app/devices.ninja +++ b/obj/device/devices_app/devices.ninja @@ -7,4 +7,5 @@ build devices/devices.mojo: ~ build obj/device/devices_app/devices.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/devices_app/devices_apptests_library.ninja b/obj/device/devices_app/devices_apptests_library.ninja index bf836fb..9122d34 100644 --- a/obj/device/devices_app/devices_apptests_library.ninja +++ b/obj/device/devices_app/devices_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = devices_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./devices_apptests_library.dll ./devices_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1558,7 +1561,9 @@ build ./devices_apptests_library.dll ./devices_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/device/devices_app/devices_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/devices_app/devices_library.ninja b/obj/device/devices_app/devices_library.ninja index e7684f4..30d4305 100644 --- a/obj/device/devices_app/devices_library.ninja +++ b/obj/device/devices_app/devices_library.ninja @@ -9,9 +9,12 @@ target_output_name = devices_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./devices_library.dll ./devices_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1507,7 +1510,9 @@ build ./devices_library.dll ./devices_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/device/devices_app/devices_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/devices_app/lib.ninja b/obj/device/devices_app/lib.ninja index 9a255f9..c7223a4 100644 --- a/obj/device/devices_app/lib.ninja +++ b/obj/device/devices_app/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/device/devices_app/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/device/devices_app/lib.inputdeps.stamp: ~ build obj/device/devices_app/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/devices_app/public/cpp/cpp.ninja b/obj/device/devices_app/public/cpp/cpp.ninja index 5ca54e4..5d01e43 100644 --- a/obj/device/devices_app/public/cpp/cpp.ninja +++ b/obj/device/devices_app/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/device/devices_app/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/devices_app/public/cpp/cpp.inputdeps.stamp: ~ build obj/device/devices_app/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/devices_app/public/cpp/factory.ninja b/obj/device/devices_app/public/cpp/factory.ninja index 1bcab20..ae5246d 100644 --- a/obj/device/devices_app/public/cpp/factory.ninja +++ b/obj/device/devices_app/public/cpp/factory.ninja @@ -10,4 +10,5 @@ target_output_name = factory ~ build obj/device/devices_app/public/cpp/factory.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/device/devices_app/public/cpp/factory.inputdeps.stamp: ~ build obj/device/devices_app/public/cpp/factory.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/devices_app/usb/public/interfaces/interfaces.ninja b/obj/device/devices_app/usb/public/interfaces/interfaces.ninja index 265e43b..79b9c95 100644 --- a/obj/device/devices_app/usb/public/interfaces/interfaces.ninja +++ b/obj/device/devices_app/usb/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/device/devices_app/usb/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/devices_app/usb/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/device/devices_app/usb/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.ninja b/obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.ninja index 1ea1e5f..f24f42d 100644 --- a/obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.inputd ~ build obj/device/devices_app/usb/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/hid/hid.ninja b/obj/device/hid/hid.ninja index f6714c8..ab6dea2 100644 --- a/obj/device/hid/hid.ninja +++ b/obj/device/hid/hid.ninja @@ -10,4 +10,5 @@ target_output_name = hid ~ build obj/device/hid/hid.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/device/hid/hid.inputdeps.stamp: ~ build obj/device/hid/hid.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/hid/mocks.ninja b/obj/device/hid/mocks.ninja index 7175b7c..7ff53dc 100644 --- a/obj/device/hid/mocks.ninja +++ b/obj/device/hid/mocks.ninja @@ -10,4 +10,5 @@ target_output_name = mocks ~ build obj/device/hid/mocks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/device/hid/mocks.inputdeps.stamp: ~ build obj/device/hid/mocks.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/nfc/mojo_bindings.ninja b/obj/device/nfc/mojo_bindings.ninja index f914a46..3f34ed0 100644 --- a/obj/device/nfc/mojo_bindings.ninja +++ b/obj/device/nfc/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/device/nfc/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/nfc/mojo_bindings.inputdeps.stamp: ~ build obj/device/nfc/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/nfc/mojo_bindings_cpp_sources.ninja b/obj/device/nfc/mojo_bindings_cpp_sources.ninja index 87ff616..d0e0589 100644 --- a/obj/device/nfc/mojo_bindings_cpp_sources.ninja +++ b/obj/device/nfc/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/device/nfc/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/device/nfc/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/device/nfc/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/nfc/nfc.ninja b/obj/device/nfc/nfc.ninja index ad73409..09cb6b2 100644 --- a/obj/device/nfc/nfc.ninja +++ b/obj/device/nfc/nfc.ninja @@ -9,8 +9,9 @@ target_output_name = nfc ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/device/nfc/nfc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/device/nfc/nfc.inputdeps.stamp: build obj/device/nfc/nfc.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -34,4 +37,5 @@ build obj/device/nfc/nfc.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/device/serial/serial.ninja b/obj/device/serial/serial.ninja index 298ba0a..5bc8969 100644 --- a/obj/device/serial/serial.ninja +++ b/obj/device/serial/serial.ninja @@ -9,9 +9,11 @@ target_output_name = device_serial ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/device/serial/device_serial.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -62,7 +64,9 @@ build obj/device/serial/device_serial.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/device/serial/serial.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/device/serial/serial_mojo.ninja b/obj/device/serial/serial_mojo.ninja index d964e4e..d07b74a 100644 --- a/obj/device/serial/serial_mojo.ninja +++ b/obj/device/serial/serial_mojo.ninja @@ -8,4 +8,5 @@ target_output_name = serial_mojo ~ build obj/device/serial/serial_mojo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/serial/serial_mojo.inputdeps.stamp: ~ build obj/device/serial/serial_mojo.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/serial/serial_mojo_cpp_sources.ninja b/obj/device/serial/serial_mojo_cpp_sources.ninja index 3eaac13..ebb08b0 100644 --- a/obj/device/serial/serial_mojo_cpp_sources.ninja +++ b/obj/device/serial/serial_mojo_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = serial_mojo_cpp_sources ~ build obj/device/serial/serial_mojo_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/device/serial/serial_mojo_cpp_sources.inputdeps.stamp: ~ build obj/device/serial/serial_mojo_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/serial/test_support.ninja b/obj/device/serial/test_support.ninja index 9654dc2..5ca772b 100644 --- a/obj/device/serial/test_support.ninja +++ b/obj/device/serial/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/device/serial/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/device/serial/test_support.inputdeps.stamp: build obj/device/serial/test_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -78,4 +81,5 @@ build obj/device/serial/test_support.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/device/usb/mocks.ninja b/obj/device/usb/mocks.ninja index 19ff7ce..b212bfb 100644 --- a/obj/device/usb/mocks.ninja +++ b/obj/device/usb/mocks.ninja @@ -10,4 +10,5 @@ target_output_name = mocks ~ build obj/device/usb/mocks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/device/usb/mocks.inputdeps.stamp: ~ build obj/device/usb/mocks.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/usb/usb.ninja b/obj/device/usb/usb.ninja index 56a859f..5dc6a5f 100644 --- a/obj/device/usb/usb.ninja +++ b/obj/device/usb/usb.ninja @@ -10,4 +10,5 @@ target_output_name = usb ~ build obj/device/usb/usb.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/device/usb/usb.inputdeps.stamp: ~ build obj/device/usb/usb.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/device/vibration/mojo_bindings.ninja b/obj/device/vibration/mojo_bindings.ninja index 394cb79..3bbcbfa 100644 --- a/obj/device/vibration/mojo_bindings.ninja +++ b/obj/device/vibration/mojo_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = mojo_bindings ~ build obj/device/vibration/mojo_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/device/vibration/mojo_bindings.inputdeps.stamp: ~ build obj/device/vibration/mojo_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/vibration/mojo_bindings_cpp_sources.ninja b/obj/device/vibration/mojo_bindings_cpp_sources.ninja index 4452b60..3d4e684 100644 --- a/obj/device/vibration/mojo_bindings_cpp_sources.ninja +++ b/obj/device/vibration/mojo_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_bindings_cpp_sources ~ build obj/device/vibration/mojo_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/device/vibration/mojo_bindings_cpp_sources.inputdeps.stamp: ~ build obj/device/vibration/mojo_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/device/vibration/vibration.ninja b/obj/device/vibration/vibration.ninja index 6c9e5d7..bef870b 100644 --- a/obj/device/vibration/vibration.ninja +++ b/obj/device/vibration/vibration.ninja @@ -10,4 +10,5 @@ target_output_name = device_vibration ~ build obj/device/vibration/device_vibration.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -43,4 +44,5 @@ build obj/device/vibration/device_vibration.stamp: ~ build obj/device/vibration/vibration.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/extensions/browser/browser.ninja b/obj/extensions/browser/browser.ninja index 32348d0..4a0181d 100644 --- a/obj/extensions/browser/browser.ninja +++ b/obj/extensions/browser/browser.ninja @@ -12,4 +12,5 @@ target_output_name = browser ~ build obj/extensions/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -201,4 +202,5 @@ build obj/extensions/browser/browser.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/extensions/common/api/api_registration.ninja b/obj/extensions/common/api/api_registration.ninja index 5e5d125..38ccc80 100644 --- a/obj/extensions/common/api/api_registration.ninja +++ b/obj/extensions/common/api/api_registration.ninja @@ -10,4 +10,5 @@ target_output_name = api_registration ~ build obj/extensions/common/api/api_registration.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/extensions/common/api/api_registration.inputdeps.stamp: ~ build obj/extensions/common/api/api_registration.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/extensions/common/api/generated_api.ninja b/obj/extensions/common/api/generated_api.ninja index 2975e0f..ec31e30 100644 --- a/obj/extensions/common/api/generated_api.ninja +++ b/obj/extensions/common/api/generated_api.ninja @@ -10,4 +10,5 @@ target_output_name = generated_api ~ build obj/extensions/common/api/generated_api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/extensions/common/api/generated_api.inputdeps.stamp: ~ build obj/extensions/common/api/generated_api.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/common/api/mojom.ninja b/obj/extensions/common/api/mojom.ninja index 8f285df..5065e4e 100644 --- a/obj/extensions/common/api/mojom.ninja +++ b/obj/extensions/common/api/mojom.ninja @@ -8,4 +8,5 @@ target_output_name = mojom ~ build obj/extensions/common/api/mojom.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/extensions/common/api/mojom.inputdeps.stamp: ~ build obj/extensions/common/api/mojom.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/common/api/mojom_cpp_sources.ninja b/obj/extensions/common/api/mojom_cpp_sources.ninja index 93abbec..6e2e229 100644 --- a/obj/extensions/common/api/mojom_cpp_sources.ninja +++ b/obj/extensions/common/api/mojom_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojom_cpp_sources ~ build obj/extensions/common/api/mojom_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/extensions/common/api/mojom_cpp_sources.inputdeps.stamp: ~ build obj/extensions/common/api/mojom_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/common/common.ninja b/obj/extensions/common/common.ninja index e1f74d0..319ddf7 100644 --- a/obj/extensions/common/common.ninja +++ b/obj/extensions/common/common.ninja @@ -11,8 +11,9 @@ target_output_name = common ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib mf.lib mfplat.lib mfuuid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mfreadwrite.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/extensions/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -163,4 +164,6 @@ build obj/extensions/common/common.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -514,4 +517,5 @@ build obj/extensions/common/common.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/extensions/common/mojo.ninja b/obj/extensions/common/mojo.ninja index fbaf361..8e273fa 100644 --- a/obj/extensions/common/mojo.ninja +++ b/obj/extensions/common/mojo.ninja @@ -8,4 +8,5 @@ target_output_name = mojo ~ build obj/extensions/common/mojo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/extensions/common/mojo.inputdeps.stamp: ~ build obj/extensions/common/mojo.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/common/mojo_cpp_sources.ninja b/obj/extensions/common/mojo_cpp_sources.ninja index 3d638d0..08b954d 100644 --- a/obj/extensions/common/mojo_cpp_sources.ninja +++ b/obj/extensions/common/mojo_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_cpp_sources ~ build obj/extensions/common/mojo_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/extensions/common/mojo_cpp_sources.inputdeps.stamp: ~ build obj/extensions/common/mojo_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extensions_client.ninja b/obj/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extensions_client.ninja index 51cba1e..845595b 100644 --- a/obj/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extensions_client.ninja +++ b/obj/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extensions_client.ninja @@ -9,8 +9,9 @@ target_output_name = javascript_dialog_extensions_client ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extensions_client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -203,4 +204,6 @@ build obj/extensions/components/javascript_dialog_extensions_client/javascript_d ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -568,4 +571,5 @@ build obj/extensions/components/javascript_dialog_extensions_client/javascript_d obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/extensions/components/native_app_window/native_app_window.ninja b/obj/extensions/components/native_app_window/native_app_window.ninja index 301c6d1..40bb372 100644 --- a/obj/extensions/components/native_app_window/native_app_window.ninja +++ b/obj/extensions/components/native_app_window/native_app_window.ninja @@ -9,8 +9,9 @@ target_output_name = native_app_window ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/extensions/components/native_app_window/native_app_window.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -203,4 +204,6 @@ build obj/extensions/components/native_app_window/native_app_window.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -569,4 +572,5 @@ build obj/extensions/components/native_app_window/native_app_window.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/extensions/extensions_browsertests.ninja b/obj/extensions/extensions_browsertests.ninja index 43dad0c..ce4304f 100644 --- a/obj/extensions/extensions_browsertests.ninja +++ b/obj/extensions/extensions_browsertests.ninja @@ -9,5 +9,5 @@ target_output_name = extensions_browsertests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/extensions/extensions_unittests.ninja b/obj/extensions/extensions_unittests.ninja index 347dc5b..526af67 100644 --- a/obj/extensions/extensions_unittests.ninja +++ b/obj/extensions/extensions_unittests.ninja @@ -11,5 +11,5 @@ target_output_name = extensions_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/extensions/shell/app_shell.ninja b/obj/extensions/shell/app_shell.ninja index 3e78b7d..e0d99ca 100644 --- a/obj/extensions/shell/app_shell.ninja +++ b/obj/extensions/shell/app_shell.ninja @@ -9,5 +9,5 @@ target_output_name = app_shell ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/extensions/shell/app_shell_unittests.ninja b/obj/extensions/shell/app_shell_unittests.ninja index afdc987..f69dd9f 100644 --- a/obj/extensions/shell/app_shell_unittests.ninja +++ b/obj/extensions/shell/app_shell_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = app_shell_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/extensions/shell/common/api/api.ninja b/obj/extensions/shell/common/api/api.ninja index 31a7d90..083781a 100644 --- a/obj/extensions/shell/common/api/api.ninja +++ b/obj/extensions/shell/common/api/api.ninja @@ -10,4 +10,5 @@ target_output_name = api ~ build obj/extensions/shell/common/api/api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/extensions/shell/common/api/api.inputdeps.stamp: ~ build obj/extensions/shell/common/api/api.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/shell/common/api/api_registration.ninja b/obj/extensions/shell/common/api/api_registration.ninja index bbd8e14..151aa1b 100644 --- a/obj/extensions/shell/common/api/api_registration.ninja +++ b/obj/extensions/shell/common/api/api_registration.ninja @@ -10,4 +10,5 @@ target_output_name = api_registration ~ build obj/extensions/shell/common/api/api_registration.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/extensions/shell/common/api/api_registration.inputdeps.stamp: ~ build obj/extensions/shell/common/api/api_registration.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/extensions/utility/utility.ninja b/obj/extensions/utility/utility.ninja index dc99aa1..d4a40d9 100644 --- a/obj/extensions/utility/utility.ninja +++ b/obj/extensions/utility/utility.ninja @@ -10,4 +10,5 @@ target_output_name = utility ~ build obj/extensions/utility/utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -162,4 +163,5 @@ build obj/extensions/utility/utility.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gin/gin.ninja b/obj/gin/gin.ninja index 54f530e..61a23f5 100644 --- a/obj/gin/gin.ninja +++ b/obj/gin/gin.ninja @@ -10,4 +10,5 @@ target_output_name = gin ~ build obj/gin/gin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/gin/gin.inputdeps.stamp: ~ build obj/gin/gin.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gin/gin_shell.ninja b/obj/gin/gin_shell.ninja index f787247..d82e8c4 100644 --- a/obj/gin/gin_shell.ninja +++ b/obj/gin/gin_shell.ninja @@ -9,9 +9,12 @@ target_output_name = gin_shell ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gin_shell.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1156,7 +1159,9 @@ build ./gin_shell.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/gin/gin_shell.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gin/gin_test.ninja b/obj/gin/gin_test.ninja index 232bd24..fa89b4a 100644 --- a/obj/gin/gin_test.ninja +++ b/obj/gin/gin_test.ninja @@ -10,4 +10,5 @@ target_output_name = gin_test ~ build obj/gin/gin_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/gin/gin_test.inputdeps.stamp: ~ build obj/gin/gin_test.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gin/gin_unittests.ninja b/obj/gin/gin_unittests.ninja index 23cb62e..5cbaedc 100644 --- a/obj/gin/gin_unittests.ninja +++ b/obj/gin/gin_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = gin_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gin_unittests.exe: ~ ./gin_shell.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1224,7 +1227,9 @@ build ./gin_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/gin/gin_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/google_apis/gcm/gcm.ninja b/obj/google_apis/gcm/gcm.ninja index b904a84..a5a6c34 100644 --- a/obj/google_apis/gcm/gcm.ninja +++ b/obj/google_apis/gcm/gcm.ninja @@ -10,4 +10,5 @@ target_output_name = gcm ~ build obj/google_apis/gcm/gcm.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/google_apis/gcm/gcm.inputdeps.stamp: ~ build obj/google_apis/gcm/gcm.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/google_apis/gcm/gcm_unit_tests.ninja b/obj/google_apis/gcm/gcm_unit_tests.ninja index b9e3e13..f1d0a14 100644 --- a/obj/google_apis/gcm/gcm_unit_tests.ninja +++ b/obj/google_apis/gcm/gcm_unit_tests.ninja @@ -9,9 +9,12 @@ target_output_name = gcm_unit_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gcm_unit_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1925,7 +1928,9 @@ build ./gcm_unit_tests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/google_apis/gcm/gcm_unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/google_apis/gcm/mcs_probe.ninja b/obj/google_apis/gcm/mcs_probe.ninja index 3bfb511..cc68af8 100644 --- a/obj/google_apis/gcm/mcs_probe.ninja +++ b/obj/google_apis/gcm/mcs_probe.ninja @@ -9,9 +9,12 @@ target_output_name = mcs_probe ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mcs_probe.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1908,7 +1911,9 @@ build ./mcs_probe.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/google_apis/gcm/mcs_probe.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/google_apis/gcm/test_support.ninja b/obj/google_apis/gcm/test_support.ninja index 4e8069f..3807eb2 100644 --- a/obj/google_apis/gcm/test_support.ninja +++ b/obj/google_apis/gcm/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/google_apis/gcm/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/google_apis/gcm/test_support.inputdeps.stamp: ~ build obj/google_apis/gcm/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/google_apis/google_apis.ninja b/obj/google_apis/google_apis.ninja index d8114ae..fac1c91 100644 --- a/obj/google_apis/google_apis.ninja +++ b/obj/google_apis/google_apis.ninja @@ -10,4 +10,5 @@ target_output_name = google_apis ~ build obj/google_apis/google_apis.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/google_apis/google_apis.inputdeps.stamp: ~ build obj/google_apis/google_apis.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/google_apis/google_apis_unittests.ninja b/obj/google_apis/google_apis_unittests.ninja index 355fab2..7551f99 100644 --- a/obj/google_apis/google_apis_unittests.ninja +++ b/obj/google_apis/google_apis_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = google_apis_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./google_apis_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1936,7 +1939,9 @@ build ./google_apis_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/google_apis/google_apis_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/google_apis/test_support.ninja b/obj/google_apis/test_support.ninja index 73e8501..98ecbbd 100644 --- a/obj/google_apis/test_support.ninja +++ b/obj/google_apis/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/google_apis/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -44,4 +45,5 @@ build obj/google_apis/test_support.inputdeps.stamp: ~ build obj/google_apis/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/blink/blink.ninja b/obj/gpu/blink/blink.ninja index ebf18a3..ecdca00 100644 --- a/obj/gpu/blink/blink.ninja +++ b/obj/gpu/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = gpu_blink ~ build obj/gpu/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -60,4 +61,5 @@ build obj/gpu/blink/blink/webgraphicscontext3d_in_process_command_buffer_impl.ob ~ build obj/gpu/blink/gpu_blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/command_buffer/client/client_sources.ninja b/obj/gpu/command_buffer/client/client_sources.ninja index c39f9d8..6f5d3da 100644 --- a/obj/gpu/command_buffer/client/client_sources.ninja +++ b/obj/gpu/command_buffer/client/client_sources.ninja @@ -10,4 +10,5 @@ target_output_name = client_sources ~ build obj/gpu/command_buffer/client/client_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/client/client_sources.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/client_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/client/gl_in_process_context.ninja b/obj/gpu/command_buffer/client/gl_in_process_context.ninja index 9eb9ab1..4125107 100644 --- a/obj/gpu/command_buffer/client/gl_in_process_context.ninja +++ b/obj/gpu/command_buffer/client/gl_in_process_context.ninja @@ -10,4 +10,5 @@ target_output_name = gl_in_process_context ~ build obj/gpu/command_buffer/client/gl_in_process_context.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/gpu/command_buffer/client/gl_in_process_context.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gl_in_process_context.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/command_buffer/client/gles2_c_lib.ninja b/obj/gpu/command_buffer/client/gles2_c_lib.ninja index 93beffd..029295b 100644 --- a/obj/gpu/command_buffer/client/gles2_c_lib.ninja +++ b/obj/gpu/command_buffer/client/gles2_c_lib.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_c_lib ~ build obj/gpu/command_buffer/client/gles2_c_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/client/gles2_c_lib.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gles2_c_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/client/gles2_c_lib_nocheck.ninja b/obj/gpu/command_buffer/client/gles2_c_lib_nocheck.ninja index 364916a..1de5963 100644 --- a/obj/gpu/command_buffer/client/gles2_c_lib_nocheck.ninja +++ b/obj/gpu/command_buffer/client/gles2_c_lib_nocheck.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_c_lib_nocheck ~ build obj/gpu/command_buffer/client/gles2_c_lib_nocheck.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/gpu/command_buffer/client/gles2_c_lib_nocheck.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gles2_c_lib_nocheck.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/command_buffer/client/gles2_cmd_helper_sources.ninja b/obj/gpu/command_buffer/client/gles2_cmd_helper_sources.ninja index 5630da1..0f9d833 100644 --- a/obj/gpu/command_buffer/client/gles2_cmd_helper_sources.ninja +++ b/obj/gpu/command_buffer/client/gles2_cmd_helper_sources.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_cmd_helper_sources ~ build obj/gpu/command_buffer/client/gles2_cmd_helper_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/client/gles2_cmd_helper_sources.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gles2_cmd_helper_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/client/gles2_implementation.ninja b/obj/gpu/command_buffer/client/gles2_implementation.ninja index 3d10f69..aa48a19 100644 --- a/obj/gpu/command_buffer/client/gles2_implementation.ninja +++ b/obj/gpu/command_buffer/client/gles2_implementation.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_implementation ~ build obj/gpu/command_buffer/client/gles2_implementation.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/client/gles2_implementation.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gles2_implementation.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/client/gles2_implementation_no_check.ninja b/obj/gpu/command_buffer/client/gles2_implementation_no_check.ninja index 56752e8..414a8c4 100644 --- a/obj/gpu/command_buffer/client/gles2_implementation_no_check.ninja +++ b/obj/gpu/command_buffer/client/gles2_implementation_no_check.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_implementation_no_check ~ build obj/gpu/command_buffer/client/gles2_implementation_no_check.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/gpu/command_buffer/client/gles2_implementation_no_check.inputdeps.stam ~ build obj/gpu/command_buffer/client/gles2_implementation_no_check.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/command_buffer/client/gles2_interface.ninja b/obj/gpu/command_buffer/client/gles2_interface.ninja index 5527c40..c3ecea9 100644 --- a/obj/gpu/command_buffer/client/gles2_interface.ninja +++ b/obj/gpu/command_buffer/client/gles2_interface.ninja @@ -8,4 +8,5 @@ target_output_name = gles2_interface ~ build obj/gpu/command_buffer/client/gles2_interface.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -13,4 +14,5 @@ build obj/gpu/command_buffer/client/gles2_interface.inputdeps.stamp: ~ build obj/gpu/command_buffer/client/gles2_interface.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/common/common_sources.ninja b/obj/gpu/command_buffer/common/common_sources.ninja index fa20077..ae127e6 100644 --- a/obj/gpu/command_buffer/common/common_sources.ninja +++ b/obj/gpu/command_buffer/common/common_sources.ninja @@ -10,4 +10,5 @@ target_output_name = common_sources ~ build obj/gpu/command_buffer/common/common_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/common/common_sources.inputdeps.stamp: ~ build obj/gpu/command_buffer/common/common_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/common/gles2_utils.ninja b/obj/gpu/command_buffer/common/gles2_utils.ninja index 269c882..e1d6aee 100644 --- a/obj/gpu/command_buffer/common/gles2_utils.ninja +++ b/obj/gpu/command_buffer/common/gles2_utils.ninja @@ -10,4 +10,5 @@ target_output_name = gles2_utils ~ build obj/gpu/command_buffer/common/gles2_utils.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/gpu/command_buffer/common/gles2_utils.inputdeps.stamp: ~ build obj/gpu/command_buffer/common/gles2_utils.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/command_buffer/service/service_sources.ninja b/obj/gpu/command_buffer/service/service_sources.ninja index 353702e..268d10c 100644 --- a/obj/gpu/command_buffer/service/service_sources.ninja +++ b/obj/gpu/command_buffer/service/service_sources.ninja @@ -12,4 +12,5 @@ target_output_name = service_sources ~ build obj/gpu/command_buffer/service/service_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/gpu/command_buffer/service/service_sources.inputdeps.stamp: ~ build obj/gpu/command_buffer/service/service_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/command_buffer_gles2.ninja b/obj/gpu/command_buffer_gles2.ninja index 9c9c9da..8bcb6ca 100644 --- a/obj/gpu/command_buffer_gles2.ninja +++ b/obj/gpu/command_buffer_gles2.ninja @@ -9,8 +9,11 @@ target_output_name = command_buffer_gles2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .dll ~ build ./command_buffer_gles2.dll ./command_buffer_gles2.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2460,7 +2463,9 @@ build ./command_buffer_gles2.dll ./command_buffer_gles2.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/gpu/command_buffer_gles2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/config/config_sources.ninja b/obj/gpu/config/config_sources.ninja index 0804309..ef73b5b 100644 --- a/obj/gpu/config/config_sources.ninja +++ b/obj/gpu/config/config_sources.ninja @@ -10,4 +10,5 @@ target_output_name = config_sources ~ build obj/gpu/config/config_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/gpu/config/config_sources.inputdeps.stamp: ~ build obj/gpu/config/config_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/gl_tests.ninja b/obj/gpu/gl_tests.ninja index ce9a52b..258ccd4 100644 --- a/obj/gpu/gl_tests.ninja +++ b/obj/gpu/gl_tests.ninja @@ -9,9 +9,12 @@ target_output_name = gl_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gl_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2548,7 +2551,9 @@ build ./gl_tests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/gpu/gl_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/gles2_conform_support/egl/egl.ninja b/obj/gpu/gles2_conform_support/egl/egl.ninja index 21a47fd..4b2cc0c 100644 --- a/obj/gpu/gles2_conform_support/egl/egl.ninja +++ b/obj/gpu/gles2_conform_support/egl/egl.ninja @@ -10,4 +10,5 @@ target_output_name = egl_native ~ build obj/gpu/gles2_conform_support/egl/egl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -67,4 +68,5 @@ build obj/gpu/gles2_conform_support/egl/egl/surface.obj: ~ build obj/gpu/gles2_conform_support/egl/egl_native.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/gles2_conform_support/gles2_conform_support.ninja b/obj/gpu/gles2_conform_support/gles2_conform_support.ninja index a2baa9d..f8ffcd9 100644 --- a/obj/gpu/gles2_conform_support/gles2_conform_support.ninja +++ b/obj/gpu/gles2_conform_support/gles2_conform_support.ninja @@ -10,9 +10,12 @@ target_output_name = gles2_conform_support ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gles2_conform_support.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2467,7 +2470,9 @@ build ./gles2_conform_support.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/gpu/gles2_conform_support/gles2_conform_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/gles2_conform_support/gles2_conform_test.ninja b/obj/gpu/gles2_conform_support/gles2_conform_test.ninja index de0f80b..2170b7c 100644 --- a/obj/gpu/gles2_conform_support/gles2_conform_test.ninja +++ b/obj/gpu/gles2_conform_support/gles2_conform_test.ninja @@ -9,9 +9,12 @@ target_output_name = gles2_conform_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gles2_conform_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2362,7 +2365,9 @@ build ./gles2_conform_test.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/gpu/gles2_conform_support/gles2_conform_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/gpu.ninja b/obj/gpu/gpu.ninja index 50d88b7..d97a138 100644 --- a/obj/gpu/gpu.ninja +++ b/obj/gpu/gpu.ninja @@ -8,4 +8,5 @@ target_output_name = gpu ~ build obj/gpu/gpu.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/gpu/gpu.inputdeps.stamp: ~ build obj/gpu/gpu.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/gpu/gpu_perftests.ninja b/obj/gpu/gpu_perftests.ninja index 4d44727..8392853 100644 --- a/obj/gpu/gpu_perftests.ninja +++ b/obj/gpu/gpu_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = gpu_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gpu_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2453,7 +2456,9 @@ build ./gpu_perftests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/gpu/gpu_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/gpu_unittests.ninja b/obj/gpu/gpu_unittests.ninja index 45aa9b2..19f0ac7 100644 --- a/obj/gpu/gpu_unittests.ninja +++ b/obj/gpu/gpu_unittests.ninja @@ -11,9 +11,12 @@ target_output_name = gpu_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gpu_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2602,7 +2605,9 @@ build ./gpu_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/gpu/gpu_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/gpu/ipc/ipc_sources.ninja b/obj/gpu/ipc/ipc_sources.ninja index 592b0c0..ddc4573 100644 --- a/obj/gpu/ipc/ipc_sources.ninja +++ b/obj/gpu/ipc/ipc_sources.ninja @@ -10,4 +10,5 @@ target_output_name = ipc_sources ~ build obj/gpu/ipc/ipc_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/gpu/ipc/ipc_sources.inputdeps.stamp: ~ build obj/gpu/ipc/ipc_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/skia_bindings/skia_bindings.ninja b/obj/gpu/skia_bindings/skia_bindings.ninja index 5e5fa7e..377d1e2 100644 --- a/obj/gpu/skia_bindings/skia_bindings.ninja +++ b/obj/gpu/skia_bindings/skia_bindings.ninja @@ -10,4 +10,5 @@ target_output_name = skia_bindings ~ build obj/gpu/skia_bindings/skia_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/gpu/skia_bindings/skia_bindings.inputdeps.stamp: ~ build obj/gpu/skia_bindings/skia_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/gpu/test_support.ninja b/obj/gpu/test_support.ninja index 45c5dd3..ce6cfc6 100644 --- a/obj/gpu/test_support.ninja +++ b/obj/gpu/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/gpu/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/gpu/test_support.inputdeps.stamp: ~ build obj/gpu/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ipc/ipc.ninja b/obj/ipc/ipc.ninja index cef3364..7d5c14f 100644 --- a/obj/ipc/ipc.ninja +++ b/obj/ipc/ipc.ninja @@ -10,4 +10,5 @@ target_output_name = ipc ~ build obj/ipc/ipc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/ipc/ipc.inputdeps.stamp: ~ build obj/ipc/ipc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ipc/ipc_perftests.ninja b/obj/ipc/ipc_perftests.ninja index c91c0ff..f2ebe41 100644 --- a/obj/ipc/ipc_perftests.ninja +++ b/obj/ipc/ipc_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = ipc_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./ipc_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -840,7 +843,9 @@ build ./ipc_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/ipc/ipc_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ipc/ipc_tests.ninja b/obj/ipc/ipc_tests.ninja index a56b46b..9aab80e 100644 --- a/obj/ipc/ipc_tests.ninja +++ b/obj/ipc/ipc_tests.ninja @@ -9,9 +9,12 @@ target_output_name = ipc_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./ipc_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -851,7 +854,9 @@ build ./ipc_tests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/ipc/ipc_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ipc/mojo/client_channel.ninja b/obj/ipc/mojo/client_channel.ninja index 14e37c2..7a8aee0 100644 --- a/obj/ipc/mojo/client_channel.ninja +++ b/obj/ipc/mojo/client_channel.ninja @@ -8,4 +8,5 @@ target_output_name = client_channel ~ build obj/ipc/mojo/client_channel.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ipc/mojo/client_channel.inputdeps.stamp: ~ build obj/ipc/mojo/client_channel.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ipc/mojo/client_channel_cpp_sources.ninja b/obj/ipc/mojo/client_channel_cpp_sources.ninja index ad1fc43..680d132 100644 --- a/obj/ipc/mojo/client_channel_cpp_sources.ninja +++ b/obj/ipc/mojo/client_channel_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = client_channel_cpp_sources ~ build obj/ipc/mojo/client_channel_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/ipc/mojo/client_channel_cpp_sources.inputdeps.stamp: ~ build obj/ipc/mojo/client_channel_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ipc/mojo/ipc_mojo_perftests.ninja b/obj/ipc/mojo/ipc_mojo_perftests.ninja index 1ef0e63..0c8b53d 100644 --- a/obj/ipc/mojo/ipc_mojo_perftests.ninja +++ b/obj/ipc/mojo/ipc_mojo_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = ipc_mojo_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./ipc_mojo_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -992,7 +995,9 @@ build ./ipc_mojo_perftests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ipc/mojo/ipc_mojo_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ipc/mojo/ipc_mojo_unittests.ninja b/obj/ipc/mojo/ipc_mojo_unittests.ninja index bf35919..3eb2587 100644 --- a/obj/ipc/mojo/ipc_mojo_unittests.ninja +++ b/obj/ipc/mojo/ipc_mojo_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = ipc_mojo_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./ipc_mojo_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -993,7 +996,9 @@ build ./ipc_mojo_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ipc/mojo/ipc_mojo_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ipc/mojo/mojo.ninja b/obj/ipc/mojo/mojo.ninja index 924cbf6..4043dca 100644 --- a/obj/ipc/mojo/mojo.ninja +++ b/obj/ipc/mojo/mojo.ninja @@ -10,4 +10,5 @@ target_output_name = mojo ~ build obj/ipc/mojo/mojo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ipc/mojo/mojo.inputdeps.stamp: ~ build obj/ipc/mojo/mojo.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ipc/test_support.ninja b/obj/ipc/test_support.ninja index d640d53..eaedd8e 100644 --- a/obj/ipc/test_support.ninja +++ b/obj/ipc/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ipc/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/ipc/test_support.inputdeps.stamp: ~ build obj/ipc/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/jingle/jingle_glue.ninja b/obj/jingle/jingle_glue.ninja index 5c12e9c..ef0bc82 100644 --- a/obj/jingle/jingle_glue.ninja +++ b/obj/jingle/jingle_glue.ninja @@ -9,8 +9,9 @@ target_output_name = jingle_glue ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .lib ~ build obj/jingle/jingle_glue.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/jingle/jingle_glue.inputdeps.stamp: build obj/jingle/jingle_glue.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -72,4 +75,5 @@ build obj/jingle/jingle_glue.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/jingle/jingle_unittests.ninja b/obj/jingle/jingle_unittests.ninja index e66d606..9880c66 100644 --- a/obj/jingle/jingle_unittests.ninja +++ b/obj/jingle/jingle_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = jingle_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .exe ~ build ./jingle_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1908,7 +1911,9 @@ build ./jingle_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/jingle/jingle_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/jingle/notifier.ninja b/obj/jingle/notifier.ninja index 25e574c..b27d3cb 100644 --- a/obj/jingle/notifier.ninja +++ b/obj/jingle/notifier.ninja @@ -9,8 +9,9 @@ target_output_name = notifier ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .lib ~ build obj/jingle/notifier.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/jingle/notifier.inputdeps.stamp: build obj/jingle/notifier.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -89,4 +92,5 @@ build obj/jingle/notifier.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/jingle/notifier_test_util.ninja b/obj/jingle/notifier_test_util.ninja index 519ec88..855feb3 100644 --- a/obj/jingle/notifier_test_util.ninja +++ b/obj/jingle/notifier_test_util.ninja @@ -9,8 +9,9 @@ target_output_name = notifier_test_util ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .lib ~ build obj/jingle/notifier_test_util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/jingle/notifier_test_util.inputdeps.stamp: build obj/jingle/notifier_test_util.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -71,4 +74,5 @@ build obj/jingle/notifier_test_util.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/mandoline/app/desktop/mandoline.ninja b/obj/mandoline/app/desktop/mandoline.ninja index c12c348..fefcf08 100644 --- a/obj/mandoline/app/desktop/mandoline.ninja +++ b/obj/mandoline/app/desktop/mandoline.ninja @@ -9,9 +9,12 @@ target_output_name = mandoline ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mandoline.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3682,7 +3685,9 @@ build ./mandoline.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mandoline/app/desktop/mandoline.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/services/core_services/core_services.ninja b/obj/mandoline/services/core_services/core_services.ninja index 4e38a1a..2575f65 100644 --- a/obj/mandoline/services/core_services/core_services.ninja +++ b/obj/mandoline/services/core_services/core_services.ninja @@ -7,4 +7,5 @@ build core_services/core_services.mojo: ~ build obj/mandoline/services/core_services/core_services.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/services/core_services/core_services_library.ninja b/obj/mandoline/services/core_services/core_services_library.ninja index 1e3b6af..f0136d9 100644 --- a/obj/mandoline/services/core_services/core_services_library.ninja +++ b/obj/mandoline/services/core_services/core_services_library.ninja @@ -7,6 +7,6 @@ target_output_name = core_services_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./core_services_library.dll ./core_services_library.dll.lib: ~ @@ -14,4 +14,7 @@ build ./core_services_library.dll ./core_services_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3750,7 +3753,9 @@ build ./core_services_library.dll ./core_services_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mandoline/services/core_services/core_services_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/services/core_services/sources.ninja b/obj/mandoline/services/core_services/sources.ninja index c1acbc2..9e87cec 100644 --- a/obj/mandoline/services/core_services/sources.ninja +++ b/obj/mandoline/services/core_services/sources.ninja @@ -10,4 +10,5 @@ target_output_name = sources ~ build obj/mandoline/services/core_services/sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -61,4 +62,5 @@ build obj/mandoline/services/core_services/sources.inputdeps.stamp: ~ build obj/mandoline/services/core_services/sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mandoline/services/updater/updater.ninja b/obj/mandoline/services/updater/updater.ninja index a880448..2c24495 100644 --- a/obj/mandoline/services/updater/updater.ninja +++ b/obj/mandoline/services/updater/updater.ninja @@ -1,4 +1,5 @@ ~ build obj/mandoline/services/updater/updater.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/services/updater/updater_library.ninja b/obj/mandoline/services/updater/updater_library.ninja index e27384e..ab8703e 100644 --- a/obj/mandoline/services/updater/updater_library.ninja +++ b/obj/mandoline/services/updater/updater_library.ninja @@ -9,9 +9,12 @@ target_output_name = updater_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./updater_library.dll ./updater_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1506,7 +1509,9 @@ build ./updater_library.dll ./updater_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mandoline/services/updater/updater_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/desktop_ui.ninja b/obj/mandoline/ui/desktop_ui/desktop_ui.ninja index 05395df..39fdd2b 100644 --- a/obj/mandoline/ui/desktop_ui/desktop_ui.ninja +++ b/obj/mandoline/ui/desktop_ui/desktop_ui.ninja @@ -7,4 +7,5 @@ build desktop_ui/desktop_ui.mojo: ~ build obj/mandoline/ui/desktop_ui/desktop_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/desktop_ui__copy_resources.ninja b/obj/mandoline/ui/desktop_ui/desktop_ui__copy_resources.ninja index 45939d6..b791541 100644 --- a/obj/mandoline/ui/desktop_ui/desktop_ui__copy_resources.ninja +++ b/obj/mandoline/ui/desktop_ui/desktop_ui__copy_resources.ninja @@ -7,4 +7,5 @@ build desktop_ui/resources/mandoline_ui.pak: ~ build obj/mandoline/ui/desktop_ui/desktop_ui__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/desktop_ui_library.ninja b/obj/mandoline/ui/desktop_ui/desktop_ui_library.ninja index 0f5a1c4..60d1ad3 100644 --- a/obj/mandoline/ui/desktop_ui/desktop_ui_library.ninja +++ b/obj/mandoline/ui/desktop_ui/desktop_ui_library.ninja @@ -9,6 +9,6 @@ target_output_name = desktop_ui_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./desktop_ui_library.dll ./desktop_ui_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./desktop_ui_library.dll ./desktop_ui_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3965,7 +3968,9 @@ build ./desktop_ui_library.dll ./desktop_ui_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mandoline/ui/desktop_ui/desktop_ui_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/lib.ninja b/obj/mandoline/ui/desktop_ui/lib.ninja index dfc6cf8..f4df4f4 100644 --- a/obj/mandoline/ui/desktop_ui/lib.ninja +++ b/obj/mandoline/ui/desktop_ui/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mandoline/ui/desktop_ui/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -65,4 +66,5 @@ build obj/mandoline/ui/desktop_ui/lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests.ninja b/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests.ninja index b7d0bf5..44fdf53 100644 --- a/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests.ninja +++ b/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests.ninja @@ -7,4 +7,5 @@ build mandoline_browser_apptests/mandoline_browser_apptests.mojo: ~ build obj/mandoline/ui/desktop_ui/mandoline_browser_apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests_library.ninja b/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests_library.ninja index ae4fb10..b3cfc98 100644 --- a/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests_library.ninja +++ b/obj/mandoline/ui/desktop_ui/mandoline_browser_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = mandoline_browser_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./mandoline_browser_apptests_library.dll ./mandoline_browser_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -621,7 +624,9 @@ build ./mandoline_browser_apptests_library.dll ./mandoline_browser_apptests_libr obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mandoline/ui/desktop_ui/mandoline_browser_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.ninja b/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.ninja index a5a44f9..7f5a61b 100644 --- a/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.ninja +++ b/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.ninja b/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.ninja index 9b9776a..4473e4c 100644 --- a/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,5 @@ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.input ~ build obj/mandoline/ui/desktop_ui/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mandoline/ui/omnibox/lib.ninja b/obj/mandoline/ui/omnibox/lib.ninja index 932c8d1..35ae746 100644 --- a/obj/mandoline/ui/omnibox/lib.ninja +++ b/obj/mandoline/ui/omnibox/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mandoline/ui/omnibox/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -64,4 +65,5 @@ build obj/mandoline/ui/omnibox/lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mandoline/ui/omnibox/omnibox.ninja b/obj/mandoline/ui/omnibox/omnibox.ninja index 01d47c6..688669e 100644 --- a/obj/mandoline/ui/omnibox/omnibox.ninja +++ b/obj/mandoline/ui/omnibox/omnibox.ninja @@ -1,4 +1,5 @@ ~ build obj/mandoline/ui/omnibox/omnibox.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/omnibox/omnibox__copy_resources.ninja b/obj/mandoline/ui/omnibox/omnibox__copy_resources.ninja index 824881f..ce5f960 100644 --- a/obj/mandoline/ui/omnibox/omnibox__copy_resources.ninja +++ b/obj/mandoline/ui/omnibox/omnibox__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mandoline/ui/omnibox/omnibox__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mandoline/ui/omnibox/omnibox_library.ninja b/obj/mandoline/ui/omnibox/omnibox_library.ninja index b482c94..1c21283 100644 --- a/obj/mandoline/ui/omnibox/omnibox_library.ninja +++ b/obj/mandoline/ui/omnibox/omnibox_library.ninja @@ -9,6 +9,6 @@ target_output_name = omnibox_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./omnibox_library.dll ./omnibox_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./omnibox_library.dll ./omnibox_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3960,7 +3963,9 @@ build ./omnibox_library.dll ./omnibox_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mandoline/ui/omnibox/omnibox_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/browser_driver/browser_driver.ninja b/obj/mash/browser_driver/browser_driver.ninja index 47bd13c..9bf90d1 100644 --- a/obj/mash/browser_driver/browser_driver.ninja +++ b/obj/mash/browser_driver/browser_driver.ninja @@ -7,4 +7,5 @@ build browser_driver/browser_driver.mojo: ~ build obj/mash/browser_driver/browser_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/browser_driver/browser_driver_library.ninja b/obj/mash/browser_driver/browser_driver_library.ninja index a24ab50..79097c2 100644 --- a/obj/mash/browser_driver/browser_driver_library.ninja +++ b/obj/mash/browser_driver/browser_driver_library.ninja @@ -9,9 +9,12 @@ target_output_name = browser_driver_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./browser_driver_library.dll ./browser_driver_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3573,7 +3576,9 @@ build ./browser_driver_library.dll ./browser_driver_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/browser_driver/browser_driver_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/example/views_examples/views_examples.ninja b/obj/mash/example/views_examples/views_examples.ninja index b23af4d..068f646 100644 --- a/obj/mash/example/views_examples/views_examples.ninja +++ b/obj/mash/example/views_examples/views_examples.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/example/views_examples/views_examples.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/example/views_examples/views_examples__copy_resources.ninja b/obj/mash/example/views_examples/views_examples__copy_resources.ninja index 2f4a335..7d9579e 100644 --- a/obj/mash/example/views_examples/views_examples__copy_resources.ninja +++ b/obj/mash/example/views_examples/views_examples__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/example/views_examples/views_examples__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/example/views_examples/views_examples_library.ninja b/obj/mash/example/views_examples/views_examples_library.ninja index f5c05b0..f7e67c8 100644 --- a/obj/mash/example/views_examples/views_examples_library.ninja +++ b/obj/mash/example/views_examples/views_examples_library.ninja @@ -9,6 +9,6 @@ target_output_name = views_examples_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dwmapi.lib imm32.lib oleacc.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./views_examples_library.dll ./views_examples_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./views_examples_library.dll ./views_examples_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3978,7 +3981,9 @@ build ./views_examples_library.dll ./views_examples_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/example/views_examples/views_examples_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/example/window_type_launcher/window_type_launcher.ninja b/obj/mash/example/window_type_launcher/window_type_launcher.ninja index 58e2d8b..4558cc4 100644 --- a/obj/mash/example/window_type_launcher/window_type_launcher.ninja +++ b/obj/mash/example/window_type_launcher/window_type_launcher.ninja @@ -9,11 +9,14 @@ target_output_name = window_type_launcher_exe ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./window_type_launcher_exe.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -4019,7 +4022,9 @@ build ./window_type_launcher_exe.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mash/example/window_type_launcher/window_type_launcher.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/mash_unittests.ninja b/obj/mash/mash_unittests.ninja index cbb5c63..a45f0af 100644 --- a/obj/mash/mash_unittests.ninja +++ b/obj/mash/mash_unittests.ninja @@ -7,11 +7,14 @@ target_output_name = mash_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .exe ~ build ./mash_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -4093,7 +4096,9 @@ build ./mash_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mash/mash_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/quick_launch/quick_launch.ninja b/obj/mash/quick_launch/quick_launch.ninja index 5c2aa5c..ae210e2 100644 --- a/obj/mash/quick_launch/quick_launch.ninja +++ b/obj/mash/quick_launch/quick_launch.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/quick_launch/quick_launch.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/quick_launch/quick_launch__copy_resources.ninja b/obj/mash/quick_launch/quick_launch__copy_resources.ninja index 0b3272e..e58a1fd 100644 --- a/obj/mash/quick_launch/quick_launch__copy_resources.ninja +++ b/obj/mash/quick_launch/quick_launch__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/quick_launch/quick_launch__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/quick_launch/quick_launch_library.ninja b/obj/mash/quick_launch/quick_launch_library.ninja index 3799cb5..0b08a1a 100644 --- a/obj/mash/quick_launch/quick_launch_library.ninja +++ b/obj/mash/quick_launch/quick_launch_library.ninja @@ -9,6 +9,6 @@ target_output_name = quick_launch_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dwmapi.lib imm32.lib oleacc.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./quick_launch_library.dll ./quick_launch_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./quick_launch_library.dll ./quick_launch_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3950,7 +3953,9 @@ build ./quick_launch_library.dll ./quick_launch_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/quick_launch/quick_launch_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/shell/mash_shell_library.ninja b/obj/mash/shell/mash_shell_library.ninja index 574a220..32c96dd 100644 --- a/obj/mash/shell/mash_shell_library.ninja +++ b/obj/mash/shell/mash_shell_library.ninja @@ -9,9 +9,12 @@ target_output_name = mash_shell_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./mash_shell_library.dll ./mash_shell_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -540,7 +543,9 @@ build ./mash_shell_library.dll ./mash_shell_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/shell/mash_shell_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/shell/shell.ninja b/obj/mash/shell/shell.ninja index b97c367..8695619 100644 --- a/obj/mash/shell/shell.ninja +++ b/obj/mash/shell/shell.ninja @@ -7,4 +7,5 @@ build mash_shell/mash_shell.mojo: ~ build obj/mash/shell/shell.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/system_ui/system_ui.ninja b/obj/mash/system_ui/system_ui.ninja index 1988c46..88490e8 100644 --- a/obj/mash/system_ui/system_ui.ninja +++ b/obj/mash/system_ui/system_ui.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/system_ui/system_ui.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/system_ui/system_ui__copy_resources.ninja b/obj/mash/system_ui/system_ui__copy_resources.ninja index d14594a..98ff633 100644 --- a/obj/mash/system_ui/system_ui__copy_resources.ninja +++ b/obj/mash/system_ui/system_ui__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/system_ui/system_ui__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/system_ui/system_ui_library.ninja b/obj/mash/system_ui/system_ui_library.ninja index 0c9e72f..419f216 100644 --- a/obj/mash/system_ui/system_ui_library.ninja +++ b/obj/mash/system_ui/system_ui_library.ninja @@ -9,6 +9,6 @@ target_output_name = system_ui_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./system_ui_library.dll ./system_ui_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./system_ui_library.dll ./system_ui_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3954,7 +3957,9 @@ build ./system_ui_library.dll ./system_ui_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/system_ui/system_ui_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/task_viewer/task_viewer.ninja b/obj/mash/task_viewer/task_viewer.ninja index e29dc0f..4bfc526 100644 --- a/obj/mash/task_viewer/task_viewer.ninja +++ b/obj/mash/task_viewer/task_viewer.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/task_viewer/task_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/task_viewer/task_viewer__copy_resources.ninja b/obj/mash/task_viewer/task_viewer__copy_resources.ninja index ac9cb8b..5493918 100644 --- a/obj/mash/task_viewer/task_viewer__copy_resources.ninja +++ b/obj/mash/task_viewer/task_viewer__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/task_viewer/task_viewer__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/task_viewer/task_viewer_library.ninja b/obj/mash/task_viewer/task_viewer_library.ninja index fa3ea58..0bc3aca 100644 --- a/obj/mash/task_viewer/task_viewer_library.ninja +++ b/obj/mash/task_viewer/task_viewer_library.ninja @@ -9,6 +9,6 @@ target_output_name = task_viewer_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dwmapi.lib imm32.lib oleacc.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./task_viewer_library.dll ./task_viewer_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./task_viewer_library.dll ./task_viewer_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3951,7 +3954,9 @@ build ./task_viewer_library.dll ./task_viewer_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/task_viewer/task_viewer_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wallpaper/wallpaper.ninja b/obj/mash/wallpaper/wallpaper.ninja index 212cc15..b4fb9e0 100644 --- a/obj/mash/wallpaper/wallpaper.ninja +++ b/obj/mash/wallpaper/wallpaper.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/wallpaper/wallpaper.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wallpaper/wallpaper__copy_resources.ninja b/obj/mash/wallpaper/wallpaper__copy_resources.ninja index 1fe095d..c36406d 100644 --- a/obj/mash/wallpaper/wallpaper__copy_resources.ninja +++ b/obj/mash/wallpaper/wallpaper__copy_resources.ninja @@ -1,4 +1,5 @@ ~ build obj/mash/wallpaper/wallpaper__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wallpaper/wallpaper_library.ninja b/obj/mash/wallpaper/wallpaper_library.ninja index eabe5f9..2974941 100644 --- a/obj/mash/wallpaper/wallpaper_library.ninja +++ b/obj/mash/wallpaper/wallpaper_library.ninja @@ -9,6 +9,6 @@ target_output_name = wallpaper_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./wallpaper_library.dll ./wallpaper_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./wallpaper_library.dll ./wallpaper_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3953,7 +3956,9 @@ build ./wallpaper_library.dll ./wallpaper_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/wallpaper/wallpaper_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wm/apptests.ninja b/obj/mash/wm/apptests.ninja index 4e4c631..e938445 100644 --- a/obj/mash/wm/apptests.ninja +++ b/obj/mash/wm/apptests.ninja @@ -7,4 +7,5 @@ build mash_wm_apptests/mash_wm_apptests.mojo: ~ build obj/mash/wm/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wm/desktop_wm__copy_resources.ninja b/obj/mash/wm/desktop_wm__copy_resources.ninja index bdf007e..af70599 100644 --- a/obj/mash/wm/desktop_wm__copy_resources.ninja +++ b/obj/mash/wm/desktop_wm__copy_resources.ninja @@ -7,4 +7,5 @@ build desktop_wm/resources/mash_wm_resources.pak: ~ build obj/mash/wm/desktop_wm__copy_resources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wm/desktop_wm_library.ninja b/obj/mash/wm/desktop_wm_library.ninja index 7ecd3b0..12b2313 100644 --- a/obj/mash/wm/desktop_wm_library.ninja +++ b/obj/mash/wm/desktop_wm_library.ninja @@ -9,6 +9,6 @@ target_output_name = desktop_wm_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .dll ~ build ./desktop_wm_library.dll ./desktop_wm_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./desktop_wm_library.dll ./desktop_wm_library.dll.lib: ./libGLESv2.dll.lib ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3974,7 +3977,9 @@ build ./desktop_wm_library.dll ./desktop_wm_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/wm/desktop_wm_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wm/lib.ninja b/obj/mash/wm/lib.ninja index 32da3de..e15fcb5 100644 --- a/obj/mash/wm/lib.ninja +++ b/obj/mash/wm/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mash/wm/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -65,4 +66,5 @@ build obj/mash/wm/lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mash/wm/mash_wm_apptests_library.ninja b/obj/mash/wm/mash_wm_apptests_library.ninja index 50522de..843f4e2 100644 --- a/obj/mash/wm/mash_wm_apptests_library.ninja +++ b/obj/mash/wm/mash_wm_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = mash_wm_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .dll ~ build ./mash_wm_apptests_library.dll ./mash_wm_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3628,7 +3631,9 @@ build ./mash_wm_apptests_library.dll ./mash_wm_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mash/wm/mash_wm_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mash/wm/public/interfaces/interfaces.ninja b/obj/mash/wm/public/interfaces/interfaces.ninja index 69780ea..84b0887 100644 --- a/obj/mash/wm/public/interfaces/interfaces.ninja +++ b/obj/mash/wm/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mash/wm/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mash/wm/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/mash/wm/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mash/wm/public/interfaces/interfaces_cpp_sources.ninja b/obj/mash/wm/public/interfaces/interfaces_cpp_sources.ninja index 7f1278e..62dd968 100644 --- a/obj/mash/wm/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mash/wm/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mash/wm/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mash/wm/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/mash/wm/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mash/wm/unittests.ninja b/obj/mash/wm/unittests.ninja index 23df1e8..b1afad0 100644 --- a/obj/mash/wm/unittests.ninja +++ b/obj/mash/wm/unittests.ninja @@ -10,4 +10,5 @@ target_output_name = unittests ~ build obj/mash/wm/unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -65,4 +66,5 @@ build obj/mash/wm/unittests.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mash/wm/wm.ninja b/obj/mash/wm/wm.ninja index 708b306..1f86bb4 100644 --- a/obj/mash/wm/wm.ninja +++ b/obj/mash/wm/wm.ninja @@ -7,4 +7,5 @@ build desktop_wm/desktop_wm.mojo: ~ build obj/mash/wm/wm.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/audio/unittests.ninja b/obj/media/audio/unittests.ninja index e1e6de0..8f52fdb 100644 --- a/obj/media/audio/unittests.ninja +++ b/obj/media/audio/unittests.ninja @@ -10,4 +10,5 @@ target_output_name = unittests ~ build obj/media/audio/unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/media/audio/unittests.inputdeps.stamp: ~ build obj/media/audio/unittests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/media/audio_unittests.ninja b/obj/media/audio_unittests.ninja index 4a59306..bccea46 100644 --- a/obj/media/audio_unittests.ninja +++ b/obj/media/audio_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = audio_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib ~ output_extension = .exe ~ build ./audio_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2290,7 +2293,9 @@ build ./audio_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/audio_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/base/base.ninja b/obj/media/base/base.ninja index 1a00261..e3ec8f5 100644 --- a/obj/media/base/base.ninja +++ b/obj/media/base/base.ninja @@ -12,4 +12,5 @@ target_output_name = base ~ build obj/media/base/base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/media/base/base.inputdeps.stamp: ~ build obj/media/base/base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/base/perftests.ninja b/obj/media/base/perftests.ninja index ccc448f..b46b6be 100644 --- a/obj/media/base/perftests.ninja +++ b/obj/media/base/perftests.ninja @@ -10,4 +10,5 @@ target_output_name = perftests ~ build obj/media/base/perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/base/perftests.inputdeps.stamp: ~ build obj/media/base/perftests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/base/test_support.ninja b/obj/media/base/test_support.ninja index d18b83e..32ae705 100644 --- a/obj/media/base/test_support.ninja +++ b/obj/media/base/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/media/base/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/media/base/test_support.inputdeps.stamp: ~ build obj/media/base/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/media/base/unittests.ninja b/obj/media/base/unittests.ninja index 96bc30b..3723d89 100644 --- a/obj/media/base/unittests.ninja +++ b/obj/media/base/unittests.ninja @@ -10,4 +10,5 @@ target_output_name = unittests ~ build obj/media/base/unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/base/unittests.inputdeps.stamp: ~ build obj/media/base/unittests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/blink/blink.ninja b/obj/media/blink/blink.ninja index 3cb45a1..b4d3312 100644 --- a/obj/media/blink/blink.ninja +++ b/obj/media/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = media_blink ~ build obj/media/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -290,4 +291,5 @@ build obj/media/blink/blink/websourcebuffer_impl.obj: ~ build obj/media/blink/media_blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/blink/media_blink_unittests.ninja b/obj/media/blink/media_blink_unittests.ninja index 1039a70..4af90b1 100644 --- a/obj/media/blink/media_blink_unittests.ninja +++ b/obj/media/blink/media_blink_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = media_blink_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./media_blink_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -7261,7 +7264,9 @@ build ./media_blink_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/media/blink/media_blink_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/cast_benchmarks.ninja b/obj/media/cast/cast_benchmarks.ninja index 127bd47..e356445 100644 --- a/obj/media/cast/cast_benchmarks.ninja +++ b/obj/media/cast/cast_benchmarks.ninja @@ -9,9 +9,12 @@ target_output_name = cast_benchmarks ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./cast_benchmarks.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2907,7 +2910,9 @@ build ./cast_benchmarks.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/cast_benchmarks.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/cast_receiver.ninja b/obj/media/cast/cast_receiver.ninja index 2454f67..224936d 100644 --- a/obj/media/cast/cast_receiver.ninja +++ b/obj/media/cast/cast_receiver.ninja @@ -7,8 +7,9 @@ target_output_name = cast_receiver ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .lib ~ build obj/media/cast/cast_receiver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,6 @@ build obj/media/cast/cast_receiver.inputdeps.stamp: build obj/media/cast/cast_receiver.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -111,4 +114,5 @@ build obj/media/cast/cast_receiver.lib: obj/ui/gfx/gfx_export.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/media/cast/cast_receiver_app.ninja b/obj/media/cast/cast_receiver_app.ninja index c24cdac..c39215d 100644 --- a/obj/media/cast/cast_receiver_app.ninja +++ b/obj/media/cast/cast_receiver_app.ninja @@ -9,9 +9,12 @@ target_output_name = cast_receiver_app ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./cast_receiver_app.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2888,7 +2891,9 @@ build ./cast_receiver_app.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/cast_receiver_app.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/cast_sender.ninja b/obj/media/cast/cast_sender.ninja index 8c7fdc7..3cd4206 100644 --- a/obj/media/cast/cast_sender.ninja +++ b/obj/media/cast/cast_sender.ninja @@ -7,8 +7,9 @@ target_output_name = cast_sender ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .lib ~ build obj/media/cast/cast_sender.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,6 @@ build obj/media/cast/cast_sender.inputdeps.stamp: build obj/media/cast/cast_sender.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -111,4 +114,5 @@ build obj/media/cast/cast_sender.lib: obj/ui/gfx/gfx_export.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/media/cast/cast_sender_app.ninja b/obj/media/cast/cast_sender_app.ninja index ffa0ff1..7f419af 100644 --- a/obj/media/cast/cast_sender_app.ninja +++ b/obj/media/cast/cast_sender_app.ninja @@ -9,9 +9,12 @@ target_output_name = cast_sender_app ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./cast_sender_app.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2904,7 +2907,9 @@ build ./cast_sender_app.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/cast_sender_app.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/cast_simulator.ninja b/obj/media/cast/cast_simulator.ninja index 5a29fe6..a298d8e 100644 --- a/obj/media/cast/cast_simulator.ninja +++ b/obj/media/cast/cast_simulator.ninja @@ -9,9 +9,12 @@ target_output_name = cast_simulator ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./cast_simulator.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2906,7 +2909,9 @@ build ./cast_simulator.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/cast_simulator.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/cast_unittests.ninja b/obj/media/cast/cast_unittests.ninja index 199c96e..c3f84b9 100644 --- a/obj/media/cast/cast_unittests.ninja +++ b/obj/media/cast/cast_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = cast_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./cast_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2949,7 +2952,9 @@ build ./cast_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/cast_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/common.ninja b/obj/media/cast/common.ninja index 78bbfa8..43f1958 100644 --- a/obj/media/cast/common.ninja +++ b/obj/media/cast/common.ninja @@ -10,4 +10,5 @@ target_output_name = common ~ build obj/media/cast/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/cast/common.inputdeps.stamp: ~ build obj/media/cast/common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/cast/generate_barcode_video.ninja b/obj/media/cast/generate_barcode_video.ninja index 3fdec91..a9bb5d2 100644 --- a/obj/media/cast/generate_barcode_video.ninja +++ b/obj/media/cast/generate_barcode_video.ninja @@ -9,9 +9,12 @@ target_output_name = generate_barcode_video ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./generate_barcode_video.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2889,7 +2892,9 @@ build ./generate_barcode_video.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/generate_barcode_video.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/generate_timecode_audio.ninja b/obj/media/cast/generate_timecode_audio.ninja index 9e18710..a0a1df2 100644 --- a/obj/media/cast/generate_timecode_audio.ninja +++ b/obj/media/cast/generate_timecode_audio.ninja @@ -9,9 +9,12 @@ target_output_name = generate_timecode_audio ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./generate_timecode_audio.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2889,7 +2892,9 @@ build ./generate_timecode_audio.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/generate_timecode_audio.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cast/net.ninja b/obj/media/cast/net.ninja index 6b6ebfe..a2cb202 100644 --- a/obj/media/cast/net.ninja +++ b/obj/media/cast/net.ninja @@ -10,4 +10,5 @@ target_output_name = net ~ build obj/media/cast/net.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/cast/net.inputdeps.stamp: ~ build obj/media/cast/net.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/cast/receiver.ninja b/obj/media/cast/receiver.ninja index 29924a0..ac29e26 100644 --- a/obj/media/cast/receiver.ninja +++ b/obj/media/cast/receiver.ninja @@ -10,4 +10,5 @@ target_output_name = receiver ~ build obj/media/cast/receiver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/media/cast/receiver.inputdeps.stamp: ~ build obj/media/cast/receiver.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/cast/sender.ninja b/obj/media/cast/sender.ninja index d3b3216..a388f30 100644 --- a/obj/media/cast/sender.ninja +++ b/obj/media/cast/sender.ninja @@ -10,4 +10,5 @@ target_output_name = sender ~ build obj/media/cast/sender.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/media/cast/sender.inputdeps.stamp: ~ build obj/media/cast/sender.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/cast/test_support.ninja b/obj/media/cast/test_support.ninja index 8f9172a..c0f1776 100644 --- a/obj/media/cast/test_support.ninja +++ b/obj/media/cast/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .lib ~ build obj/media/cast/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,6 @@ build obj/media/cast/test_support.inputdeps.stamp: build obj/media/cast/test_support.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -137,4 +140,5 @@ build obj/media/cast/test_support.lib: obj/ui/gfx/test_support.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/media/cast/udp_proxy.ninja b/obj/media/cast/udp_proxy.ninja index 0b338b0..d04833c 100644 --- a/obj/media/cast/udp_proxy.ninja +++ b/obj/media/cast/udp_proxy.ninja @@ -9,9 +9,12 @@ target_output_name = udp_proxy ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./udp_proxy.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2889,7 +2892,9 @@ build ./udp_proxy.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/cast/udp_proxy.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cdm/ppapi/clearkeycdm.ninja b/obj/media/cdm/ppapi/clearkeycdm.ninja index 4bc0bfa..77675c2 100644 --- a/obj/media/cdm/ppapi/clearkeycdm.ninja +++ b/obj/media/cdm/ppapi/clearkeycdm.ninja @@ -9,8 +9,11 @@ target_output_name = clearkeycdm ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .dll ~ build ./clearkeycdm.dll ./clearkeycdm.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2198,7 +2201,9 @@ build ./clearkeycdm.dll ./clearkeycdm.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/media/cdm/ppapi/clearkeycdm.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/cdm/ppapi/clearkeycdmadapter.ninja b/obj/media/cdm/ppapi/clearkeycdmadapter.ninja index f5d4db7..a12e822 100644 --- a/obj/media/cdm/ppapi/clearkeycdmadapter.ninja +++ b/obj/media/cdm/ppapi/clearkeycdmadapter.ninja @@ -9,9 +9,10 @@ target_output_name = clearkeycdmadapter ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib ~ output_extension = .dll ~ build ./clearkeycdmadapter.dll ./clearkeycdmadapter.dll.lib: ~ ./clearkeycdm.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ obj/media/cdm/ppapi/clearkeycdmadapter/cdm_file_io_impl.obj ~ obj/media/cdm/ppapi/clearkeycdmadapter/cdm_helpers.obj ~ @@ -133,7 +134,9 @@ build ./clearkeycdmadapter.dll ./clearkeycdmadapter.dll.lib: obj/ppapi/cpp/objects/x509_certificate_private.obj ~ solink ~ +| ~ || ~ ~ build obj/media/cdm/ppapi/clearkeycdmadapter.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/ffmpeg_regression_tests.ninja b/obj/media/ffmpeg_regression_tests.ninja index 1ae3e3c..16620da 100644 --- a/obj/media/ffmpeg_regression_tests.ninja +++ b/obj/media/ffmpeg_regression_tests.ninja @@ -9,9 +9,12 @@ target_output_name = ffmpeg_regression_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./ffmpeg_regression_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2274,7 +2277,9 @@ build ./ffmpeg_regression_tests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/ffmpeg_regression_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/media.ninja b/obj/media/media.ninja index 6949620..f76e99f 100644 --- a/obj/media/media.ninja +++ b/obj/media/media.ninja @@ -12,4 +12,5 @@ target_output_name = media ~ build obj/media/media.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/media/media.inputdeps.stamp: ~ build obj/media/media.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/media_perftests.ninja b/obj/media/media_perftests.ninja index a8bfc86..5a3e59d 100644 --- a/obj/media/media_perftests.ninja +++ b/obj/media/media_perftests.ninja @@ -7,9 +7,12 @@ target_output_name = media_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib ~ output_extension = .exe ~ build ./media_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2281,7 +2284,9 @@ build ./media_perftests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/media_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/midi/midi.ninja b/obj/media/midi/midi.ninja index 730f168..f37a46b 100644 --- a/obj/media/midi/midi.ninja +++ b/obj/media/midi/midi.ninja @@ -10,4 +10,5 @@ target_output_name = midi ~ build obj/media/midi/midi.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/midi/midi.inputdeps.stamp: ~ build obj/media/midi/midi.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/midi/midi_unittests.ninja b/obj/media/midi/midi_unittests.ninja index 9a7f1bf..34f88a7 100644 --- a/obj/media/midi/midi_unittests.ninja +++ b/obj/media/midi/midi_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = midi_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./midi_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1457,7 +1460,9 @@ build ./midi_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/midi/midi_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/interfaces/interfaces.ninja b/obj/media/mojo/interfaces/interfaces.ninja index b22932b..43dfd05 100644 --- a/obj/media/mojo/interfaces/interfaces.ninja +++ b/obj/media/mojo/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/media/mojo/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/media/mojo/interfaces/interfaces.inputdeps.stamp: ~ build obj/media/mojo/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/media/mojo/interfaces/interfaces_cpp_sources.ninja b/obj/media/mojo/interfaces/interfaces_cpp_sources.ninja index 699c1e5..76e6537 100644 --- a/obj/media/mojo/interfaces/interfaces_cpp_sources.ninja +++ b/obj/media/mojo/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/media/mojo/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/media/mojo/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/media/mojo/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/media/mojo/services/application.ninja b/obj/media/mojo/services/application.ninja index 6ff7242..4754e6e 100644 --- a/obj/media/mojo/services/application.ninja +++ b/obj/media/mojo/services/application.ninja @@ -10,4 +10,5 @@ target_output_name = application ~ build obj/media/mojo/services/application.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/media/mojo/services/application.inputdeps.stamp: ~ build obj/media/mojo/services/application.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/mojo/services/cdm_service.ninja b/obj/media/mojo/services/cdm_service.ninja index 4847d11..d4ccbed 100644 --- a/obj/media/mojo/services/cdm_service.ninja +++ b/obj/media/mojo/services/cdm_service.ninja @@ -10,4 +10,5 @@ target_output_name = cdm_service ~ build obj/media/mojo/services/cdm_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/media/mojo/services/cdm_service.inputdeps.stamp: ~ build obj/media/mojo/services/cdm_service.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/mojo/services/converters.ninja b/obj/media/mojo/services/converters.ninja index 1c18f96..160b5cf 100644 --- a/obj/media/mojo/services/converters.ninja +++ b/obj/media/mojo/services/converters.ninja @@ -10,4 +10,5 @@ target_output_name = converters ~ build obj/media/mojo/services/converters.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/media/mojo/services/converters.inputdeps.stamp: ~ build obj/media/mojo/services/converters.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/mojo/services/media.ninja b/obj/media/mojo/services/media.ninja index 6a5a1d6..5f6e52d 100644 --- a/obj/media/mojo/services/media.ninja +++ b/obj/media/mojo/services/media.ninja @@ -7,4 +7,5 @@ build media/media.mojo: ~ build obj/media/mojo/services/media.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_apptests.ninja b/obj/media/mojo/services/media_apptests.ninja index e8c463d..2685c59 100644 --- a/obj/media/mojo/services/media_apptests.ninja +++ b/obj/media/mojo/services/media_apptests.ninja @@ -7,4 +7,5 @@ build media_apptests/media_apptests.mojo: ~ build obj/media/mojo/services/media_apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_apptests_library.ninja b/obj/media/mojo/services/media_apptests_library.ninja index 05066cb..4bacc2b 100644 --- a/obj/media/mojo/services/media_apptests_library.ninja +++ b/obj/media/mojo/services/media_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = media_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .dll ~ build ./media_apptests_library.dll ./media_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2388,7 +2391,9 @@ build ./media_apptests_library.dll ./media_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/media/mojo/services/media_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_client.ninja b/obj/media/mojo/services/media_client.ninja index 9eebab6..0970e3e 100644 --- a/obj/media/mojo/services/media_client.ninja +++ b/obj/media/mojo/services/media_client.ninja @@ -10,4 +10,5 @@ target_output_name = media_client ~ build obj/media/mojo/services/media_client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/mojo/services/media_client.inputdeps.stamp: ~ build obj/media/mojo/services/media_client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/mojo/services/media_library.ninja b/obj/media/mojo/services/media_library.ninja index e96c54d..9b171ee 100644 --- a/obj/media/mojo/services/media_library.ninja +++ b/obj/media/mojo/services/media_library.ninja @@ -9,9 +9,12 @@ target_output_name = media_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .dll ~ build ./media_library.dll ./media_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2330,7 +2333,9 @@ build ./media_library.dll ./media_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/media/mojo/services/media_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_mojo_unittests.ninja b/obj/media/mojo/services/media_mojo_unittests.ninja index 2914ca1..841c35e 100644 --- a/obj/media/mojo/services/media_mojo_unittests.ninja +++ b/obj/media/mojo/services/media_mojo_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = media_mojo_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .exe ~ build ./media_mojo_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2402,7 +2405,9 @@ build ./media_mojo_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/media/mojo/services/media_mojo_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_pipeline_integration_apptests.ninja b/obj/media/mojo/services/media_pipeline_integration_apptests.ninja index ac36dd8..6879432 100644 --- a/obj/media/mojo/services/media_pipeline_integration_apptests.ninja +++ b/obj/media/mojo/services/media_pipeline_integration_apptests.ninja @@ -7,4 +7,5 @@ build media_pipeline_integration_apptests/media_pipeline_integration_apptests.mo ~ build obj/media/mojo/services/media_pipeline_integration_apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/media_pipeline_integration_apptests_library.ninja b/obj/media/mojo/services/media_pipeline_integration_apptests_library.ninja index ab7396a..1b4c52e 100644 --- a/obj/media/mojo/services/media_pipeline_integration_apptests_library.ninja +++ b/obj/media/mojo/services/media_pipeline_integration_apptests_library.ninja @@ -7,9 +7,12 @@ target_output_name = media_pipeline_integration_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib ~ output_extension = .dll ~ build ./media_pipeline_integration_apptests_library.dll ./media_pipeline_integration_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2406,7 +2409,9 @@ build ./media_pipeline_integration_apptests_library.dll ./media_pipeline_integra obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/media/mojo/services/media_pipeline_integration_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/media/mojo/services/proxy.ninja b/obj/media/mojo/services/proxy.ninja index ecf5445..4cdbe8f 100644 --- a/obj/media/mojo/services/proxy.ninja +++ b/obj/media/mojo/services/proxy.ninja @@ -10,4 +10,5 @@ target_output_name = proxy ~ build obj/media/mojo/services/proxy.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/media/mojo/services/proxy.inputdeps.stamp: ~ build obj/media/mojo/services/proxy.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/mojo/services/renderer_service.ninja b/obj/media/mojo/services/renderer_service.ninja index 8e6832e..3fd981a 100644 --- a/obj/media/mojo/services/renderer_service.ninja +++ b/obj/media/mojo/services/renderer_service.ninja @@ -10,4 +10,5 @@ target_output_name = renderer_service ~ build obj/media/mojo/services/renderer_service.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/media/mojo/services/renderer_service.inputdeps.stamp: ~ build obj/media/mojo/services/renderer_service.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/shared_memory_support.ninja b/obj/media/shared_memory_support.ninja index df0e010..e626c6b 100644 --- a/obj/media/shared_memory_support.ninja +++ b/obj/media/shared_memory_support.ninja @@ -10,4 +10,5 @@ target_output_name = shared_memory_support ~ build obj/media/shared_memory_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/media/shared_memory_support.inputdeps.stamp: ~ build obj/media/shared_memory_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/media/test/mojo_pipeline_integration_tests.ninja b/obj/media/test/mojo_pipeline_integration_tests.ninja index 743b8bc..0fd27e7 100644 --- a/obj/media/test/mojo_pipeline_integration_tests.ninja +++ b/obj/media/test/mojo_pipeline_integration_tests.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_pipeline_integration_tests ~ build obj/media/test/mojo_pipeline_integration_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/media/test/mojo_pipeline_integration_tests.inputdeps.stamp: ~ build obj/media/test/mojo_pipeline_integration_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/test/pipeline_integration_perftests.ninja b/obj/media/test/pipeline_integration_perftests.ninja index 6660a8e..acb70e3 100644 --- a/obj/media/test/pipeline_integration_perftests.ninja +++ b/obj/media/test/pipeline_integration_perftests.ninja @@ -10,4 +10,5 @@ target_output_name = pipeline_integration_perftests ~ build obj/media/test/pipeline_integration_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/test/pipeline_integration_perftests.inputdeps.stamp: ~ build obj/media/test/pipeline_integration_perftests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/test/pipeline_integration_test_base.ninja b/obj/media/test/pipeline_integration_test_base.ninja index daed603..dede9b2 100644 --- a/obj/media/test/pipeline_integration_test_base.ninja +++ b/obj/media/test/pipeline_integration_test_base.ninja @@ -10,4 +10,5 @@ target_output_name = pipeline_integration_test_base ~ build obj/media/test/pipeline_integration_test_base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/test/pipeline_integration_test_base.inputdeps.stamp: ~ build obj/media/test/pipeline_integration_test_base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/test/pipeline_integration_tests.ninja b/obj/media/test/pipeline_integration_tests.ninja index d607c63..59464bc 100644 --- a/obj/media/test/pipeline_integration_tests.ninja +++ b/obj/media/test/pipeline_integration_tests.ninja @@ -10,4 +10,5 @@ target_output_name = pipeline_integration_tests ~ build obj/media/test/pipeline_integration_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/test/pipeline_integration_tests.inputdeps.stamp: ~ build obj/media/test/pipeline_integration_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/media/test_support.ninja b/obj/media/test_support.ninja index e4e9cab..f6854e9 100644 --- a/obj/media/test_support.ninja +++ b/obj/media/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/media/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -35,4 +36,5 @@ build obj/media/test_support.inputdeps.stamp: ~ build obj/media/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/common/common_base.ninja b/obj/mojo/common/common_base.ninja index 18e2388..fbe6931 100644 --- a/obj/mojo/common/common_base.ninja +++ b/obj/mojo/common/common_base.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_common_lib ~ build obj/mojo/common/common_base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,5 @@ build obj/mojo/common/common_base/user_agent.obj: ~ build obj/mojo/common/mojo_common_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/common/mojo_common_perftests.ninja b/obj/mojo/common/mojo_common_perftests.ninja index 0dc777d..2df047d 100644 --- a/obj/mojo/common/mojo_common_perftests.ninja +++ b/obj/mojo/common/mojo_common_perftests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_common_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_common_perftests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -616,7 +619,9 @@ build ./mojo_common_perftests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/common/mojo_common_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/common/mojo_common_unittests.ninja b/obj/mojo/common/mojo_common_unittests.ninja index bb3e9ca..22d0644 100644 --- a/obj/mojo/common/mojo_common_unittests.ninja +++ b/obj/mojo/common/mojo_common_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_common_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_common_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -624,7 +627,9 @@ build ./mojo_common_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/common/mojo_common_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/common/url_type_converters.ninja b/obj/mojo/common/url_type_converters.ninja index 7785d8a..b81d6e3 100644 --- a/obj/mojo/common/url_type_converters.ninja +++ b/obj/mojo/common/url_type_converters.ninja @@ -10,4 +10,5 @@ target_output_name = url_type_converters ~ build obj/mojo/common/url_type_converters.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/common/url_type_converters.inputdeps.stamp: ~ build obj/mojo/common/url_type_converters.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/converters/blink/blink.ninja b/obj/mojo/converters/blink/blink.ninja index 0915e88..8b061ab 100644 --- a/obj/mojo/converters/blink/blink.ninja +++ b/obj/mojo/converters/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_blink_lib ~ build obj/mojo/converters/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -132,4 +133,5 @@ build obj/mojo/converters/blink/blink/blink_input_events_type_converters.obj: ~ build obj/mojo/converters/blink/mojo_blink_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/converters/geometry/geometry.ninja b/obj/mojo/converters/geometry/geometry.ninja index ca7b03a..d2533ad 100644 --- a/obj/mojo/converters/geometry/geometry.ninja +++ b/obj/mojo/converters/geometry/geometry.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_geometry_lib ~ build obj/mojo/converters/geometry/geometry.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -23,4 +24,5 @@ build obj/mojo/converters/geometry/geometry/geometry_type_converters.obj: ~ build obj/mojo/converters/geometry/mojo_geometry_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/converters/ime/ime.ninja b/obj/mojo/converters/ime/ime.ninja index ddc13e6..96b8df4 100644 --- a/obj/mojo/converters/ime/ime.ninja +++ b/obj/mojo/converters/ime/ime.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_ime_lib ~ build obj/mojo/converters/ime/ime.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -49,4 +50,5 @@ build obj/mojo/converters/ime/ime/ime_type_converters.obj: ~ build obj/mojo/converters/ime/mojo_ime_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/converters/input_events/input_events.ninja b/obj/mojo/converters/input_events/input_events.ninja index 751c1a6..428b75e 100644 --- a/obj/mojo/converters/input_events/input_events.ninja +++ b/obj/mojo/converters/input_events/input_events.ninja @@ -10,4 +10,5 @@ target_output_name = input_events ~ build obj/mojo/converters/input_events/input_events.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/mojo/converters/input_events/input_events.inputdeps.stamp: ~ build obj/mojo/converters/input_events/input_events.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/converters/network/network.ninja b/obj/mojo/converters/network/network.ninja index 3565292..6ea04d4 100644 --- a/obj/mojo/converters/network/network.ninja +++ b/obj/mojo/converters/network/network.ninja @@ -10,4 +10,5 @@ target_output_name = network ~ build obj/mojo/converters/network/network.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/converters/network/network.inputdeps.stamp: ~ build obj/mojo/converters/network/network.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/converters/surfaces/surfaces.ninja b/obj/mojo/converters/surfaces/surfaces.ninja index f2c02de..107b9a0 100644 --- a/obj/mojo/converters/surfaces/surfaces.ninja +++ b/obj/mojo/converters/surfaces/surfaces.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_surfaces_lib ~ build obj/mojo/converters/surfaces/mojo_surfaces_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -134,4 +135,5 @@ build obj/mojo/converters/surfaces/mojo_surfaces_lib.stamp: ~ build obj/mojo/converters/surfaces/surfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/converters/surfaces/tests/mojo_surfaces_lib_unittests.ninja b/obj/mojo/converters/surfaces/tests/mojo_surfaces_lib_unittests.ninja index 5006043..1f956d5 100644 --- a/obj/mojo/converters/surfaces/tests/mojo_surfaces_lib_unittests.ninja +++ b/obj/mojo/converters/surfaces/tests/mojo_surfaces_lib_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_surfaces_lib_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mojo_surfaces_lib_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3612,7 +3615,9 @@ build ./mojo_surfaces_lib_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/converters/surfaces/tests/mojo_surfaces_lib_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/converters/transform/transform.ninja b/obj/mojo/converters/transform/transform.ninja index e7aa1f2..a2c4c84 100644 --- a/obj/mojo/converters/transform/transform.ninja +++ b/obj/mojo/converters/transform/transform.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_transform_lib ~ build obj/mojo/converters/transform/mojo_transform_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -57,4 +58,5 @@ build obj/mojo/converters/transform/mojo_transform_lib.stamp: ~ build obj/mojo/converters/transform/transform.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/embedder/embedder.ninja b/obj/mojo/edk/embedder/embedder.ninja index 752a8bb..1e0e03b 100644 --- a/obj/mojo/edk/embedder/embedder.ninja +++ b/obj/mojo/edk/embedder/embedder.ninja @@ -10,4 +10,5 @@ target_output_name = embedder ~ build obj/mojo/edk/embedder/embedder.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/edk/embedder/embedder.inputdeps.stamp: ~ build obj/mojo/edk/embedder/embedder.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/edk/embedder/embedder_unittests2.ninja b/obj/mojo/edk/embedder/embedder_unittests2.ninja index 08a2b51..2a9048a 100644 --- a/obj/mojo/edk/embedder/embedder_unittests2.ninja +++ b/obj/mojo/edk/embedder/embedder_unittests2.ninja @@ -10,4 +10,5 @@ target_output_name = embedder_unittests2 ~ build obj/mojo/edk/embedder/embedder_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/edk/embedder/embedder_unittests2.inputdeps.stamp: ~ build obj/mojo/edk/embedder/embedder_unittests2.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/embedder/platform.ninja b/obj/mojo/edk/embedder/platform.ninja index 31ec192..6917b1e 100644 --- a/obj/mojo/edk/embedder/platform.ninja +++ b/obj/mojo/edk/embedder/platform.ninja @@ -10,4 +10,5 @@ target_output_name = platform ~ build obj/mojo/edk/embedder/platform.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/edk/embedder/platform.inputdeps.stamp: ~ build obj/mojo/edk/embedder/platform.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/edk/js/js.ninja b/obj/mojo/edk/js/js.ninja index d454ba7..1dd2938 100644 --- a/obj/mojo/edk/js/js.ninja +++ b/obj/mojo/edk/js/js.ninja @@ -10,4 +10,5 @@ target_output_name = js ~ build obj/mojo/edk/js/js.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/mojo/edk/js/js.inputdeps.stamp: ~ build obj/mojo/edk/js/js.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/edk/js/test/js_integration_tests.ninja b/obj/mojo/edk/js/test/js_integration_tests.ninja index 9b959b9..d2a7875 100644 --- a/obj/mojo/edk/js/test/js_integration_tests.ninja +++ b/obj/mojo/edk/js/test/js_integration_tests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_js_integration_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_js_integration_tests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1404,7 +1407,9 @@ build ./mojo_js_integration_tests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/mojo/edk/js/test/js_integration_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/js/test/js_unittests.ninja b/obj/mojo/edk/js/test/js_unittests.ninja index 16372ca..2f4f0b8 100644 --- a/obj/mojo/edk/js/test/js_unittests.ninja +++ b/obj/mojo/edk/js/test/js_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_js_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_js_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1372,7 +1375,9 @@ build ./mojo_js_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/mojo/edk/js/test/js_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/js/tests/js_to_cpp_bindings.ninja b/obj/mojo/edk/js/tests/js_to_cpp_bindings.ninja index c6ee972..bdaf821 100644 --- a/obj/mojo/edk/js/tests/js_to_cpp_bindings.ninja +++ b/obj/mojo/edk/js/tests/js_to_cpp_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = js_to_cpp_bindings ~ build obj/mojo/edk/js/tests/js_to_cpp_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/edk/js/tests/js_to_cpp_bindings.inputdeps.stamp: ~ build obj/mojo/edk/js/tests/js_to_cpp_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.ninja b/obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.ninja index e8698e8..7218b2b 100644 --- a/obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.ninja +++ b/obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = js_to_cpp_bindings_cpp_sources ~ build obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.inputdeps.stamp: ~ build obj/mojo/edk/js/tests/js_to_cpp_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/edk/js/tests/js_to_cpp_tests.ninja b/obj/mojo/edk/js/tests/js_to_cpp_tests.ninja index a096479..b76f93d 100644 --- a/obj/mojo/edk/js/tests/js_to_cpp_tests.ninja +++ b/obj/mojo/edk/js/tests/js_to_cpp_tests.ninja @@ -10,4 +10,5 @@ target_output_name = js_to_cpp_tests ~ build obj/mojo/edk/js/tests/js_to_cpp_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,5 @@ build obj/mojo/edk/js/tests/js_to_cpp_tests.inputdeps.stamp: ~ build obj/mojo/edk/js/tests/js_to_cpp_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/system/mojo_message_pipe_perftests2.ninja b/obj/mojo/edk/system/mojo_message_pipe_perftests2.ninja index bb9a5a1..871af44 100644 --- a/obj/mojo/edk/system/mojo_message_pipe_perftests2.ninja +++ b/obj/mojo/edk/system/mojo_message_pipe_perftests2.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_message_pipe_perftests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_message_pipe_perftests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -557,7 +560,9 @@ build ./mojo_message_pipe_perftests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/system/mojo_message_pipe_perftests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/system/mojo_system_unittests2.ninja b/obj/mojo/edk/system/mojo_system_unittests2.ninja index d7dc50c..be89212 100644 --- a/obj/mojo/edk/system/mojo_system_unittests2.ninja +++ b/obj/mojo/edk/system/mojo_system_unittests2.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_system_unittests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_system_unittests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -581,7 +584,9 @@ build ./mojo_system_unittests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/system/mojo_system_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/system/system.ninja b/obj/mojo/edk/system/system.ninja index 4d1baa0..3440bb0 100644 --- a/obj/mojo/edk/system/system.ninja +++ b/obj/mojo/edk/system/system.ninja @@ -9,9 +9,11 @@ target_output_name = mojo_system_impl2 ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/mojo/edk/system/mojo_system_impl2.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -49,7 +51,9 @@ build obj/mojo/edk/system/mojo_system_impl2.lib: obj/mojo/public/cpp/system/system.stamp ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ build obj/mojo/edk/system/system.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/system/test_utils.ninja b/obj/mojo/edk/system/test_utils.ninja index 2743602..07697f0 100644 --- a/obj/mojo/edk/system/test_utils.ninja +++ b/obj/mojo/edk/system/test_utils.ninja @@ -10,4 +10,5 @@ target_output_name = test_utils ~ build obj/mojo/edk/system/test_utils.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/edk/system/test_utils.inputdeps.stamp: ~ build obj/mojo/edk/system/test_utils.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/test/mojo_public_bindings_unittests2.ninja b/obj/mojo/edk/test/mojo_public_bindings_unittests2.ninja index 4d1abb8..120a92d 100644 --- a/obj/mojo/edk/test/mojo_public_bindings_unittests2.ninja +++ b/obj/mojo/edk/test/mojo_public_bindings_unittests2.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_bindings_unittests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_bindings_unittests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -683,7 +686,9 @@ build ./mojo_public_bindings_unittests2.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/edk/test/mojo_public_bindings_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/test/mojo_public_environment_unittests2.ninja b/obj/mojo/edk/test/mojo_public_environment_unittests2.ninja index 8ba3afd..bc84cdb 100644 --- a/obj/mojo/edk/test/mojo_public_environment_unittests2.ninja +++ b/obj/mojo/edk/test/mojo_public_environment_unittests2.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_environment_unittests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_environment_unittests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -559,7 +562,9 @@ build ./mojo_public_environment_unittests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/test/mojo_public_environment_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/test/mojo_public_system_perftests2.ninja b/obj/mojo/edk/test/mojo_public_system_perftests2.ninja index 6827c39..00779da 100644 --- a/obj/mojo/edk/test/mojo_public_system_perftests2.ninja +++ b/obj/mojo/edk/test/mojo_public_system_perftests2.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_system_perftests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_system_perftests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -556,7 +559,9 @@ build ./mojo_public_system_perftests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/test/mojo_public_system_perftests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/test/mojo_public_system_unittests2.ninja b/obj/mojo/edk/test/mojo_public_system_unittests2.ninja index 910c5b3..7b85b39 100644 --- a/obj/mojo/edk/test/mojo_public_system_unittests2.ninja +++ b/obj/mojo/edk/test/mojo_public_system_unittests2.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_system_unittests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_system_unittests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -561,7 +564,9 @@ build ./mojo_public_system_unittests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/test/mojo_public_system_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/test/mojo_public_utility_unittests2.ninja b/obj/mojo/edk/test/mojo_public_utility_unittests2.ninja index 0e6af55..bdb680d 100644 --- a/obj/mojo/edk/test/mojo_public_utility_unittests2.ninja +++ b/obj/mojo/edk/test/mojo_public_utility_unittests2.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_utility_unittests2 ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_utility_unittests2.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -556,7 +559,9 @@ build ./mojo_public_utility_unittests2.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/mojo/edk/test/mojo_public_utility_unittests2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/edk/test/run_all_perftests.ninja b/obj/mojo/edk/test/run_all_perftests.ninja index 924a7a1..f22a174 100644 --- a/obj/mojo/edk/test/run_all_perftests.ninja +++ b/obj/mojo/edk/test/run_all_perftests.ninja @@ -10,4 +10,5 @@ target_output_name = run_all_perftests ~ build obj/mojo/edk/test/run_all_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/edk/test/run_all_perftests.inputdeps.stamp: build obj/mojo/edk/test/run_all_perftests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/test/run_all_unittests.ninja b/obj/mojo/edk/test/run_all_unittests.ninja index 3b0eb8d..394e717 100644 --- a/obj/mojo/edk/test/run_all_unittests.ninja +++ b/obj/mojo/edk/test/run_all_unittests.ninja @@ -10,4 +10,5 @@ target_output_name = run_all_unittests ~ build obj/mojo/edk/test/run_all_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/edk/test/run_all_unittests.inputdeps.stamp: build obj/mojo/edk/test/run_all_unittests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/test/test_support.ninja b/obj/mojo/edk/test/test_support.ninja index c762b9e..fb0530f 100644 --- a/obj/mojo/edk/test/test_support.ninja +++ b/obj/mojo/edk/test/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/mojo/edk/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/edk/test/test_support.inputdeps.stamp: ~ build obj/mojo/edk/test/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/edk/test/test_support_impl.ninja b/obj/mojo/edk/test/test_support_impl.ninja index 6ece758..f0e0b3c 100644 --- a/obj/mojo/edk/test/test_support_impl.ninja +++ b/obj/mojo/edk/test/test_support_impl.ninja @@ -10,4 +10,5 @@ target_output_name = test_support_impl ~ build obj/mojo/edk/test/test_support_impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/edk/test/test_support_impl.inputdeps.stamp: build obj/mojo/edk/test/test_support_impl.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/environment/chromium.ninja b/obj/mojo/environment/chromium.ninja index 539a43f..718f0c3 100644 --- a/obj/mojo/environment/chromium.ninja +++ b/obj/mojo/environment/chromium.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_environment_chromium ~ build obj/mojo/environment/chromium.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/mojo/environment/chromium/scoped_task_tracking.obj: ~ build obj/mojo/environment/mojo_environment_chromium.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/environment/chromium_impl.ninja b/obj/mojo/environment/chromium_impl.ninja index 52b2154..8f534d7 100644 --- a/obj/mojo/environment/chromium_impl.ninja +++ b/obj/mojo/environment/chromium_impl.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_environment_impl ~ build obj/mojo/environment/chromium_impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/mojo/environment/chromium_impl/default_task_tracker_impl.obj: ~ build obj/mojo/environment/mojo_environment_impl.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/gles2/gles2.ninja b/obj/mojo/gles2/gles2.ninja index 36ba39b..d8d58ec 100644 --- a/obj/mojo/gles2/gles2.ninja +++ b/obj/mojo/gles2/gles2.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_gles2_impl ~ build obj/mojo/gles2/gles2.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -70,4 +71,5 @@ build obj/mojo/gles2/gles2/gles2_impl.obj: ~ build obj/mojo/gles2/mojo_gles2_impl.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/gles2/headers.ninja b/obj/mojo/gles2/headers.ninja index 6c28b35..9b94cce 100644 --- a/obj/mojo/gles2/headers.ninja +++ b/obj/mojo/gles2/headers.ninja @@ -8,4 +8,5 @@ target_output_name = headers ~ build obj/mojo/gles2/headers.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/gles2/headers.inputdeps.stamp: ~ build obj/mojo/gles2/headers.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/gpu/mojo_gles2_implementation.ninja b/obj/mojo/gpu/mojo_gles2_implementation.ninja index 6d265e0..f37b98b 100644 --- a/obj/mojo/gpu/mojo_gles2_implementation.ninja +++ b/obj/mojo/gpu/mojo_gles2_implementation.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_gles2_implementation ~ build obj/mojo/gpu/mojo_gles2_implementation.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/gpu/mojo_gles2_implementation.inputdeps.stamp: ~ build obj/mojo/gpu/mojo_gles2_implementation.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/logging/logging.ninja b/obj/mojo/logging/logging.ninja index 191686f..126c726 100644 --- a/obj/mojo/logging/logging.ninja +++ b/obj/mojo/logging/logging.ninja @@ -10,4 +10,5 @@ target_output_name = logging ~ build obj/mojo/logging/logging.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/logging/logging.inputdeps.stamp: ~ build obj/mojo/logging/logging.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/message_pump/message_pump.ninja b/obj/mojo/message_pump/message_pump.ninja index 9d7ddc7..1547b67 100644 --- a/obj/mojo/message_pump/message_pump.ninja +++ b/obj/mojo/message_pump/message_pump.ninja @@ -10,4 +10,5 @@ target_output_name = message_pump ~ build obj/mojo/message_pump/message_pump.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/message_pump/message_pump.inputdeps.stamp: ~ build obj/mojo/message_pump/message_pump.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/platform_handle/platform_handle_impl.ninja b/obj/mojo/platform_handle/platform_handle_impl.ninja index bc11c44..0b7143d 100644 --- a/obj/mojo/platform_handle/platform_handle_impl.ninja +++ b/obj/mojo/platform_handle/platform_handle_impl.ninja @@ -10,4 +10,5 @@ target_output_name = platform_handle_impl ~ build obj/mojo/platform_handle/platform_handle_impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/platform_handle/platform_handle_impl.inputdeps.stamp: ~ build obj/mojo/platform_handle/platform_handle_impl.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/c/system/tests/perftests.ninja b/obj/mojo/public/c/system/tests/perftests.ninja index 64ae044..cff3a09 100644 --- a/obj/mojo/public/c/system/tests/perftests.ninja +++ b/obj/mojo/public/c/system/tests/perftests.ninja @@ -10,4 +10,5 @@ target_output_name = perftests ~ build obj/mojo/public/c/system/tests/perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/c/system/tests/perftests.inputdeps.stamp: build obj/mojo/public/c/system/tests/perftests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/bindings/bindings.ninja b/obj/mojo/public/cpp/bindings/bindings.ninja index 2861ce4..727ef37 100644 --- a/obj/mojo/public/cpp/bindings/bindings.ninja +++ b/obj/mojo/public/cpp/bindings/bindings.ninja @@ -10,4 +10,5 @@ target_output_name = bindings ~ build obj/mojo/public/cpp/bindings/bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/cpp/bindings/bindings.inputdeps.stamp: ~ build obj/mojo/public/cpp/bindings/bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/bindings/callback.ninja b/obj/mojo/public/cpp/bindings/callback.ninja index e76b436..107d6d8 100644 --- a/obj/mojo/public/cpp/bindings/callback.ninja +++ b/obj/mojo/public/cpp/bindings/callback.ninja @@ -8,4 +8,5 @@ target_output_name = callback ~ build obj/mojo/public/cpp/bindings/callback.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -13,4 +14,5 @@ build obj/mojo/public/cpp/bindings/callback.inputdeps.stamp: ~ build obj/mojo/public/cpp/bindings/callback.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/bindings/tests/perftests.ninja b/obj/mojo/public/cpp/bindings/tests/perftests.ninja index a553f7d..36dc64b 100644 --- a/obj/mojo/public/cpp/bindings/tests/perftests.ninja +++ b/obj/mojo/public/cpp/bindings/tests/perftests.ninja @@ -10,4 +10,5 @@ target_output_name = perftests ~ build obj/mojo/public/cpp/bindings/tests/perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/mojo/public/cpp/bindings/tests/perftests.inputdeps.stamp: build obj/mojo/public/cpp/bindings/tests/perftests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/bindings/tests/tests.ninja b/obj/mojo/public/cpp/bindings/tests/tests.ninja index f05fb57..2ba49ea 100644 --- a/obj/mojo/public/cpp/bindings/tests/tests.ninja +++ b/obj/mojo/public/cpp/bindings/tests/tests.ninja @@ -10,4 +10,5 @@ target_output_name = tests ~ build obj/mojo/public/cpp/bindings/tests/tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -23,4 +24,5 @@ build obj/mojo/public/cpp/bindings/tests/tests.inputdeps.stamp: build obj/mojo/public/cpp/bindings/tests/tests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/environment/environment.ninja b/obj/mojo/public/cpp/environment/environment.ninja index 3279407..b0e8f09 100644 --- a/obj/mojo/public/cpp/environment/environment.ninja +++ b/obj/mojo/public/cpp/environment/environment.ninja @@ -8,4 +8,5 @@ target_output_name = environment ~ build obj/mojo/public/cpp/environment/environment.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -13,4 +14,5 @@ build obj/mojo/public/cpp/environment/environment.inputdeps.stamp: ~ build obj/mojo/public/cpp/environment/environment.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/environment/standalone.ninja b/obj/mojo/public/cpp/environment/standalone.ninja index b1f875d..8c49751 100644 --- a/obj/mojo/public/cpp/environment/standalone.ninja +++ b/obj/mojo/public/cpp/environment/standalone.ninja @@ -10,4 +10,5 @@ target_output_name = standalone ~ build obj/mojo/public/cpp/environment/standalone.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/cpp/environment/standalone.inputdeps.stamp: ~ build obj/mojo/public/cpp/environment/standalone.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/environment/tests/tests.ninja b/obj/mojo/public/cpp/environment/tests/tests.ninja index e0440fd..4266440 100644 --- a/obj/mojo/public/cpp/environment/tests/tests.ninja +++ b/obj/mojo/public/cpp/environment/tests/tests.ninja @@ -10,4 +10,5 @@ target_output_name = tests ~ build obj/mojo/public/cpp/environment/tests/tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/cpp/environment/tests/tests.inputdeps.stamp: build obj/mojo/public/cpp/environment/tests/tests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/system/tests/tests.ninja b/obj/mojo/public/cpp/system/tests/tests.ninja index 09d9d96..b31fca6 100644 --- a/obj/mojo/public/cpp/system/tests/tests.ninja +++ b/obj/mojo/public/cpp/system/tests/tests.ninja @@ -10,4 +10,5 @@ target_output_name = tests ~ build obj/mojo/public/cpp/system/tests/tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/cpp/system/tests/tests.inputdeps.stamp: build obj/mojo/public/cpp/system/tests/tests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/utility/tests/tests.ninja b/obj/mojo/public/cpp/utility/tests/tests.ninja index 1a04694..66c8dee 100644 --- a/obj/mojo/public/cpp/utility/tests/tests.ninja +++ b/obj/mojo/public/cpp/utility/tests/tests.ninja @@ -10,4 +10,5 @@ target_output_name = tests ~ build obj/mojo/public/cpp/utility/tests/tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/cpp/utility/tests/tests.inputdeps.stamp: build obj/mojo/public/cpp/utility/tests/tests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/cpp/utility/utility.ninja b/obj/mojo/public/cpp/utility/utility.ninja index 68c5ea8..f7f4c9d 100644 --- a/obj/mojo/public/cpp/utility/utility.ninja +++ b/obj/mojo/public/cpp/utility/utility.ninja @@ -10,4 +10,5 @@ target_output_name = utility ~ build obj/mojo/public/cpp/utility/utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/cpp/utility/utility.inputdeps.stamp: ~ build obj/mojo/public/cpp/utility/utility.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/bindings.ninja b/obj/mojo/public/interfaces/bindings/bindings.ninja index c52baea..8cb2287 100644 --- a/obj/mojo/public/interfaces/bindings/bindings.ninja +++ b/obj/mojo/public/interfaces/bindings/bindings.ninja @@ -8,4 +8,5 @@ target_output_name = bindings ~ build obj/mojo/public/interfaces/bindings/bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -14,4 +15,5 @@ build obj/mojo/public/interfaces/bindings/bindings.inputdeps.stamp: ~ build obj/mojo/public/interfaces/bindings/bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/bindings_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/bindings_cpp_sources.ninja index 7a1b4de..abd0e37 100644 --- a/obj/mojo/public/interfaces/bindings/bindings_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = bindings_cpp_sources ~ build obj/mojo/public/interfaces/bindings/bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/interfaces/bindings/bindings_cpp_sources.inputdeps.stamp: ~ build obj/mojo/public/interfaces/bindings/bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.ninja b/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.ninja index dcda7fb..4a0b217 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = test_associated_interfaces ~ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.input ~ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.ninja index a90cca3..cd1ba17 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_associated_interfaces_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_s ~ build obj/mojo/public/interfaces/bindings/tests/test_associated_interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces.ninja index a9461ed..fcae698 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = test_interfaces ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces.inputdeps.stamp: ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.ninja index 29a1880..24f699b 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.ninja @@ -8,4 +8,5 @@ target_output_name = test_interfaces_blink ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.inputdeps. ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.ninja index 57f6d8b..51336e3 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_interfaces_blink_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_source ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_blink_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.ninja index ba9c9e0..6344255 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.ninja @@ -8,4 +8,5 @@ target_output_name = test_interfaces_chromium ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.inputde ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.ninja index 7e39b58..baa2ff5 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_interfaces_chromium_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sou ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_chromium_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.ninja index 41e3399..6cb8d48 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_interfaces_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.inpu ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.ninja index 4583910..361d520 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.ninja @@ -8,4 +8,5 @@ target_output_name = test_interfaces_experimental ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.inp ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.ninja index 6f0f768..f806667 100644 --- a/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_interfaces_experimental_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp ~ build obj/mojo/public/interfaces/bindings/tests/test_interfaces_experimental_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.ninja b/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.ninja index 0a42af2..7d9845b 100644 --- a/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = versioning_test_client_interfaces ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interface ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.ninja index a9f59c9..03e3055 100644 --- a/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = versioning_test_client_interfaces_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interface ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_client_interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.ninja b/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.ninja index 3ad289f..0c34686 100644 --- a/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = versioning_test_service_interfaces ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfac ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.ninja b/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.ninja index f1d6c3d..4627af1 100644 --- a/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.ninja +++ b/obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = versioning_test_service_interfaces_cpp_sources ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfac ~ build obj/mojo/public/interfaces/bindings/tests/versioning_test_service_interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/apptest_interfaces.ninja b/obj/mojo/runner/child/apptest_interfaces.ninja index 8cd2975..cdac1fa 100644 --- a/obj/mojo/runner/child/apptest_interfaces.ninja +++ b/obj/mojo/runner/child/apptest_interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = apptest_interfaces ~ build obj/mojo/runner/child/apptest_interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/runner/child/apptest_interfaces.inputdeps.stamp: ~ build obj/mojo/runner/child/apptest_interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/apptest_interfaces_cpp_sources.ninja b/obj/mojo/runner/child/apptest_interfaces_cpp_sources.ninja index 0e13ce0..ce3ea0d 100644 --- a/obj/mojo/runner/child/apptest_interfaces_cpp_sources.ninja +++ b/obj/mojo/runner/child/apptest_interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = apptest_interfaces_cpp_sources ~ build obj/mojo/runner/child/apptest_interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/runner/child/apptest_interfaces_cpp_sources.inputdeps.stamp: ~ build obj/mojo/runner/child/apptest_interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/apptests.ninja b/obj/mojo/runner/child/apptests.ninja index 816911f..bd371d6 100644 --- a/obj/mojo/runner/child/apptests.ninja +++ b/obj/mojo/runner/child/apptests.ninja @@ -7,4 +7,5 @@ build mojo_runner_child_apptest/mojo_runner_child_apptest.mojo: ~ build obj/mojo/runner/child/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/runner/child/interfaces.ninja b/obj/mojo/runner/child/interfaces.ninja index b23c7eb..8853ac9 100644 --- a/obj/mojo/runner/child/interfaces.ninja +++ b/obj/mojo/runner/child/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mojo/runner/child/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/runner/child/interfaces.inputdeps.stamp: ~ build obj/mojo/runner/child/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/interfaces_cpp_sources.ninja b/obj/mojo/runner/child/interfaces_cpp_sources.ninja index e8d0f6d..1da3b5a 100644 --- a/obj/mojo/runner/child/interfaces_cpp_sources.ninja +++ b/obj/mojo/runner/child/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mojo/runner/child/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/runner/child/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/mojo/runner/child/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/lib.ninja b/obj/mojo/runner/child/lib.ninja index 7a6c77a..6a23040 100644 --- a/obj/mojo/runner/child/lib.ninja +++ b/obj/mojo/runner/child/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mojo/runner/child/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/runner/child/lib.inputdeps.stamp: ~ build obj/mojo/runner/child/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/runner/child/mojo_runner_child_apptest_library.ninja b/obj/mojo/runner/child/mojo_runner_child_apptest_library.ninja index 525dc47..f463f17 100644 --- a/obj/mojo/runner/child/mojo_runner_child_apptest_library.ninja +++ b/obj/mojo/runner/child/mojo_runner_child_apptest_library.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_runner_child_apptest_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./mojo_runner_child_apptest_library.dll ./mojo_runner_child_apptest_library.dll.lib: ~ ./mojo_runner_child_apptest_native_target.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -593,7 +596,9 @@ build ./mojo_runner_child_apptest_library.dll ./mojo_runner_child_apptest_librar obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/runner/child/mojo_runner_child_apptest_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/runner/child/native_target.ninja b/obj/mojo/runner/child/native_target.ninja index 33aa55d..206e87e 100644 --- a/obj/mojo/runner/child/native_target.ninja +++ b/obj/mojo/runner/child/native_target.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_runner_child_apptest_native_target ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mojo_runner_child_apptest_native_target.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3620,7 +3623,9 @@ build ./mojo_runner_child_apptest_native_target.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/runner/child/native_target.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/runner/child/test_native_main.ninja b/obj/mojo/runner/child/test_native_main.ninja index a9d29c9..01a2ce4 100644 --- a/obj/mojo/runner/child/test_native_main.ninja +++ b/obj/mojo/runner/child/test_native_main.ninja @@ -10,4 +10,5 @@ target_output_name = test_native_main ~ build obj/mojo/runner/child/test_native_main.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/mojo/runner/child/test_native_main.inputdeps.stamp: ~ build obj/mojo/runner/child/test_native_main.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/host/lib.ninja b/obj/mojo/runner/host/lib.ninja index 835721d..86bc2ba 100644 --- a/obj/mojo/runner/host/lib.ninja +++ b/obj/mojo/runner/host/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mojo/runner/host/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -56,4 +57,5 @@ build obj/mojo/runner/host/lib.inputdeps.stamp: ~ build obj/mojo/runner/host/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/host/mojo_runner_host_unittests.ninja b/obj/mojo/runner/host/mojo_runner_host_unittests.ninja index 4984a72..2dcc252 100644 --- a/obj/mojo/runner/host/mojo_runner_host_unittests.ninja +++ b/obj/mojo/runner/host/mojo_runner_host_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_runner_host_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mojo_runner_host_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3687,7 +3690,9 @@ build ./mojo_runner_host_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/runner/host/mojo_runner_host_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/runner/host/native_application_support.ninja b/obj/mojo/runner/host/native_application_support.ninja index b3bf288..f1745fc 100644 --- a/obj/mojo/runner/host/native_application_support.ninja +++ b/obj/mojo/runner/host/native_application_support.ninja @@ -10,4 +10,5 @@ target_output_name = native_application_support ~ build obj/mojo/runner/host/native_application_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,5 @@ build obj/mojo/runner/host/native_application_support.inputdeps.stamp: ~ build obj/mojo/runner/host/native_application_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/init.ninja b/obj/mojo/runner/init.ninja index 15c63c0..9552469 100644 --- a/obj/mojo/runner/init.ninja +++ b/obj/mojo/runner/init.ninja @@ -10,4 +10,5 @@ target_output_name = init ~ build obj/mojo/runner/init.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/runner/init.inputdeps.stamp: ~ build obj/mojo/runner/init.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/lib.ninja b/obj/mojo/runner/lib.ninja index 7065149..80a38d7 100644 --- a/obj/mojo/runner/lib.ninja +++ b/obj/mojo/runner/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mojo/runner/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,5 @@ build obj/mojo/runner/lib.inputdeps.stamp: ~ build obj/mojo/runner/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/mojo_runner.ninja b/obj/mojo/runner/mojo_runner.ninja index 1f1aafb..0596028 100644 --- a/obj/mojo/runner/mojo_runner.ninja +++ b/obj/mojo/runner/mojo_runner.ninja @@ -7,9 +7,12 @@ target_output_name = mojo_runner ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./mojo_runner.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3674,7 +3677,9 @@ build ./mojo_runner.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/runner/mojo_runner.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/runner/mojo_runner_lib.ninja b/obj/mojo/runner/mojo_runner_lib.ninja index a427f63..ef106a1 100644 --- a/obj/mojo/runner/mojo_runner_lib.ninja +++ b/obj/mojo/runner/mojo_runner_lib.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_runner_lib ~ build obj/mojo/runner/mojo_runner_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -58,4 +59,5 @@ build obj/mojo/runner/mojo_runner_lib.inputdeps.stamp: ~ build obj/mojo/runner/mojo_runner_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/runner/switches.ninja b/obj/mojo/runner/switches.ninja index 6d2c3ba..09bd2e2 100644 --- a/obj/mojo/runner/switches.ninja +++ b/obj/mojo/runner/switches.ninja @@ -10,4 +10,5 @@ target_output_name = switches ~ build obj/mojo/runner/switches.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/runner/switches.inputdeps.stamp: ~ build obj/mojo/runner/switches.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/accessibility/public/interfaces/interfaces.ninja b/obj/mojo/services/accessibility/public/interfaces/interfaces.ninja index bdc9f7b..3adf7e1 100644 --- a/obj/mojo/services/accessibility/public/interfaces/interfaces.ninja +++ b/obj/mojo/services/accessibility/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mojo/services/accessibility/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/services/accessibility/public/interfaces/interfaces.inputdeps.sta ~ build obj/mojo/services/accessibility/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.ninja b/obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.ninja index 47d9285..08440ed 100644 --- a/obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.i ~ build obj/mojo/services/accessibility/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/network/apptests.ninja b/obj/mojo/services/network/apptests.ninja index cb8348a..4209d09 100644 --- a/obj/mojo/services/network/apptests.ninja +++ b/obj/mojo/services/network/apptests.ninja @@ -7,4 +7,5 @@ build network_service_apptests/network_service_apptests.mojo: ~ build obj/mojo/services/network/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/network/lib.ninja b/obj/mojo/services/network/lib.ninja index 9828f62..b4c86a6 100644 --- a/obj/mojo/services/network/lib.ninja +++ b/obj/mojo/services/network/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mojo/services/network/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/mojo/services/network/lib.inputdeps.stamp: ~ build obj/mojo/services/network/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/services/network/network.ninja b/obj/mojo/services/network/network.ninja index afb4a90..2b343f8 100644 --- a/obj/mojo/services/network/network.ninja +++ b/obj/mojo/services/network/network.ninja @@ -7,4 +7,5 @@ build network_service/network_service.mojo: ~ build obj/mojo/services/network/network.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/network/network_service_apptests_library.ninja b/obj/mojo/services/network/network_service_apptests_library.ninja index a34c5d7..49fdce8 100644 --- a/obj/mojo/services/network/network_service_apptests_library.ninja +++ b/obj/mojo/services/network/network_service_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = network_service_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./network_service_apptests_library.dll ./network_service_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2037,7 +2040,9 @@ build ./network_service_apptests_library.dll ./network_service_apptests_library. obj/v8/v8_libbase/time.obj ~ solink ~ +| ~ || ~ ~ build obj/mojo/services/network/network_service_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/network/network_service_library.ninja b/obj/mojo/services/network/network_service_library.ninja index 8920673..8830fd1 100644 --- a/obj/mojo/services/network/network_service_library.ninja +++ b/obj/mojo/services/network/network_service_library.ninja @@ -7,9 +7,12 @@ target_output_name = network_service_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./network_service_library.dll ./network_service_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1521,7 +1524,9 @@ build ./network_service_library.dll ./network_service_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/services/network/network_service_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/network/public/cpp/cpp.ninja b/obj/mojo/services/network/public/cpp/cpp.ninja index 788d814..aa306b6 100644 --- a/obj/mojo/services/network/public/cpp/cpp.ninja +++ b/obj/mojo/services/network/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/mojo/services/network/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/services/network/public/cpp/cpp.inputdeps.stamp: ~ build obj/mojo/services/network/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/services/network/public/interfaces/interfaces.ninja b/obj/mojo/services/network/public/interfaces/interfaces.ninja index 1b44a79..062ebac 100644 --- a/obj/mojo/services/network/public/interfaces/interfaces.ninja +++ b/obj/mojo/services/network/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mojo/services/network/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/services/network/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/mojo/services/network/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.ninja b/obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.ninja index df729ad..cdc2c6e 100644 --- a/obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.inputde ~ build obj/mojo/services/network/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/network/sources.ninja b/obj/mojo/services/network/sources.ninja index dfe61c6..3ede19f 100644 --- a/obj/mojo/services/network/sources.ninja +++ b/obj/mojo/services/network/sources.ninja @@ -10,4 +10,5 @@ target_output_name = sources ~ build obj/mojo/services/network/sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -39,4 +40,5 @@ build obj/mojo/services/network/sources.inputdeps.stamp: ~ build obj/mojo/services/network/sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/services/test_service/bindings.ninja b/obj/mojo/services/test_service/bindings.ninja index 84e1d64..0e02e97 100644 --- a/obj/mojo/services/test_service/bindings.ninja +++ b/obj/mojo/services/test_service/bindings.ninja @@ -8,4 +8,5 @@ target_output_name = bindings ~ build obj/mojo/services/test_service/bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/services/test_service/bindings.inputdeps.stamp: ~ build obj/mojo/services/test_service/bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/test_service/bindings_cpp_sources.ninja b/obj/mojo/services/test_service/bindings_cpp_sources.ninja index 71ef504..5b5317c 100644 --- a/obj/mojo/services/test_service/bindings_cpp_sources.ninja +++ b/obj/mojo/services/test_service/bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = bindings_cpp_sources ~ build obj/mojo/services/test_service/bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/services/test_service/bindings_cpp_sources.inputdeps.stamp: ~ build obj/mojo/services/test_service/bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/test_service/test_app.ninja b/obj/mojo/services/test_service/test_app.ninja index d1b11d5..a26ba11 100644 --- a/obj/mojo/services/test_service/test_app.ninja +++ b/obj/mojo/services/test_service/test_app.ninja @@ -1,4 +1,5 @@ ~ build obj/mojo/services/test_service/test_app.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/test_service/test_app_library.ninja b/obj/mojo/services/test_service/test_app_library.ninja index 5edb308..e4b650c 100644 --- a/obj/mojo/services/test_service/test_app_library.ninja +++ b/obj/mojo/services/test_service/test_app_library.ninja @@ -9,9 +9,12 @@ target_output_name = test_app_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./test_app_library.dll ./test_app_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -543,7 +546,9 @@ build ./test_app_library.dll ./test_app_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/services/test_service/test_app_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/test_service/test_request_tracker_app.ninja b/obj/mojo/services/test_service/test_request_tracker_app.ninja index ee92392..48dc1ca 100644 --- a/obj/mojo/services/test_service/test_request_tracker_app.ninja +++ b/obj/mojo/services/test_service/test_request_tracker_app.ninja @@ -1,4 +1,5 @@ ~ build obj/mojo/services/test_service/test_request_tracker_app.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/test_service/test_request_tracker_app_library.ninja b/obj/mojo/services/test_service/test_request_tracker_app_library.ninja index 66ae2b2..7ebc4cb 100644 --- a/obj/mojo/services/test_service/test_request_tracker_app_library.ninja +++ b/obj/mojo/services/test_service/test_request_tracker_app_library.ninja @@ -9,9 +9,12 @@ target_output_name = test_request_tracker_app_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./test_request_tracker_app_library.dll ./test_request_tracker_app_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -543,7 +546,9 @@ build ./test_request_tracker_app_library.dll ./test_request_tracker_app_library. obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/services/test_service/test_request_tracker_app_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/tracing/lib.ninja b/obj/mojo/services/tracing/lib.ninja index 68c1633..562237f 100644 --- a/obj/mojo/services/tracing/lib.ninja +++ b/obj/mojo/services/tracing/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/mojo/services/tracing/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/mojo/services/tracing/lib.inputdeps.stamp: ~ build obj/mojo/services/tracing/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/services/tracing/public/cpp/cpp.ninja b/obj/mojo/services/tracing/public/cpp/cpp.ninja index df89bb5..75738cf 100644 --- a/obj/mojo/services/tracing/public/cpp/cpp.ninja +++ b/obj/mojo/services/tracing/public/cpp/cpp.ninja @@ -10,4 +10,5 @@ target_output_name = cpp ~ build obj/mojo/services/tracing/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/mojo/services/tracing/public/cpp/cpp.inputdeps.stamp: ~ build obj/mojo/services/tracing/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/services/tracing/public/interfaces/interfaces.ninja b/obj/mojo/services/tracing/public/interfaces/interfaces.ninja index 03ed6eb..405e8b9 100644 --- a/obj/mojo/services/tracing/public/interfaces/interfaces.ninja +++ b/obj/mojo/services/tracing/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mojo/services/tracing/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/services/tracing/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/mojo/services/tracing/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.ninja b/obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.ninja index 5aa16f3..76ca025 100644 --- a/obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.inputde ~ build obj/mojo/services/tracing/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/tracing/tracing.ninja b/obj/mojo/services/tracing/tracing.ninja index 2a4faec..10c593c 100644 --- a/obj/mojo/services/tracing/tracing.ninja +++ b/obj/mojo/services/tracing/tracing.ninja @@ -1,4 +1,5 @@ ~ build obj/mojo/services/tracing/tracing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/tracing/tracing_library.ninja b/obj/mojo/services/tracing/tracing_library.ninja index 0f1a5e5..fb10600 100644 --- a/obj/mojo/services/tracing/tracing_library.ninja +++ b/obj/mojo/services/tracing/tracing_library.ninja @@ -9,8 +9,11 @@ target_output_name = tracing_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./tracing_library.dll ./tracing_library.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -542,7 +545,9 @@ build ./tracing_library.dll ./tracing_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/services/tracing/tracing_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/services/updater/updater.ninja b/obj/mojo/services/updater/updater.ninja index 4374346..d33ae9a 100644 --- a/obj/mojo/services/updater/updater.ninja +++ b/obj/mojo/services/updater/updater.ninja @@ -8,4 +8,5 @@ target_output_name = updater ~ build obj/mojo/services/updater/updater.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/services/updater/updater.inputdeps.stamp: ~ build obj/mojo/services/updater/updater.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/services/updater/updater_cpp_sources.ninja b/obj/mojo/services/updater/updater_cpp_sources.ninja index 61dc56d..2418227 100644 --- a/obj/mojo/services/updater/updater_cpp_sources.ninja +++ b/obj/mojo/services/updater/updater_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = updater_cpp_sources ~ build obj/mojo/services/updater/updater_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/services/updater/updater_cpp_sources.inputdeps.stamp: ~ build obj/mojo/services/updater/updater_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/shell/application_manager_apptest_driver.ninja b/obj/mojo/shell/application_manager_apptest_driver.ninja index 2f354b4..431f8fb 100644 --- a/obj/mojo/shell/application_manager_apptest_driver.ninja +++ b/obj/mojo/shell/application_manager_apptest_driver.ninja @@ -9,9 +9,12 @@ target_output_name = application_manager_apptest_driver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./application_manager_apptest_driver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3622,7 +3625,9 @@ build ./application_manager_apptest_driver.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/shell/application_manager_apptest_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/application_manager_apptest_target.ninja b/obj/mojo/shell/application_manager_apptest_target.ninja index 9a92118..2d5294b 100644 --- a/obj/mojo/shell/application_manager_apptest_target.ninja +++ b/obj/mojo/shell/application_manager_apptest_target.ninja @@ -9,9 +9,12 @@ target_output_name = application_manager_apptest_target ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./application_manager_apptest_target.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3622,7 +3625,9 @@ build ./application_manager_apptest_target.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/shell/application_manager_apptest_target.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/apptests.ninja b/obj/mojo/shell/apptests.ninja index 14d197a..456a9e8 100644 --- a/obj/mojo/shell/apptests.ninja +++ b/obj/mojo/shell/apptests.ninja @@ -7,4 +7,5 @@ build mojo_shell_apptests/mojo_shell_apptests.mojo: ~ build obj/mojo/shell/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/fetcher/fetcher.ninja b/obj/mojo/shell/fetcher/fetcher.ninja index b195178..e8cb3b5 100644 --- a/obj/mojo/shell/fetcher/fetcher.ninja +++ b/obj/mojo/shell/fetcher/fetcher.ninja @@ -10,4 +10,5 @@ target_output_name = fetcher ~ build obj/mojo/shell/fetcher/fetcher.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/mojo/shell/fetcher/fetcher.inputdeps.stamp: ~ build obj/mojo/shell/fetcher/fetcher.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/mojo_shell_apptests_library.ninja b/obj/mojo/shell/mojo_shell_apptests_library.ninja index a4424b8..8b09fab 100644 --- a/obj/mojo/shell/mojo_shell_apptests_library.ninja +++ b/obj/mojo/shell/mojo_shell_apptests_library.ninja @@ -9,6 +9,6 @@ target_output_name = mojo_shell_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./mojo_shell_apptests_library.dll ./mojo_shell_apptests_library.dll.lib: ~ @@ -16,4 +16,7 @@ build ./mojo_shell_apptests_library.dll ./mojo_shell_apptests_library.dll.lib: ./application_manager_apptest_target.exe ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -597,7 +600,9 @@ build ./mojo_shell_apptests_library.dll ./mojo_shell_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/mojo/shell/mojo_shell_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/mojo_shell_unittests.ninja b/obj/mojo/shell/mojo_shell_unittests.ninja index 451b734..e042cd6 100644 --- a/obj/mojo/shell/mojo_shell_unittests.ninja +++ b/obj/mojo/shell/mojo_shell_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_shell_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_shell_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1635,7 +1638,9 @@ build ./mojo_shell_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/shell/mojo_shell_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/package_manager/package_manager.ninja b/obj/mojo/shell/package_manager/package_manager.ninja index 7bab79b..e83181a 100644 --- a/obj/mojo/shell/package_manager/package_manager.ninja +++ b/obj/mojo/shell/package_manager/package_manager.ninja @@ -10,4 +10,5 @@ target_output_name = package_manager ~ build obj/mojo/shell/package_manager/package_manager.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/mojo/shell/package_manager/package_manager.inputdeps.stamp: ~ build obj/mojo/shell/package_manager/package_manager.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/package_manager/unittests.ninja b/obj/mojo/shell/package_manager/unittests.ninja index c00e19e..05a2780 100644 --- a/obj/mojo/shell/package_manager/unittests.ninja +++ b/obj/mojo/shell/package_manager/unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_package_manager_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_package_manager_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1623,7 +1626,9 @@ build ./mojo_package_manager_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/shell/package_manager/unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/public/cpp/content_handler.ninja b/obj/mojo/shell/public/cpp/content_handler.ninja index d507b68..87db66e 100644 --- a/obj/mojo/shell/public/cpp/content_handler.ninja +++ b/obj/mojo/shell/public/cpp/content_handler.ninja @@ -10,4 +10,5 @@ target_output_name = content_handler ~ build obj/mojo/shell/public/cpp/content_handler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/shell/public/cpp/content_handler.inputdeps.stamp: ~ build obj/mojo/shell/public/cpp/content_handler.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/public/cpp/cpp.ninja b/obj/mojo/shell/public/cpp/cpp.ninja index 1eee8eb..0927380 100644 --- a/obj/mojo/shell/public/cpp/cpp.ninja +++ b/obj/mojo/shell/public/cpp/cpp.ninja @@ -8,4 +8,5 @@ target_output_name = cpp ~ build obj/mojo/shell/public/cpp/cpp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/shell/public/cpp/cpp.inputdeps.stamp: ~ build obj/mojo/shell/public/cpp/cpp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/public/cpp/cpp_for_chromium.ninja b/obj/mojo/shell/public/cpp/cpp_for_chromium.ninja index 9063c6a..ae5a002 100644 --- a/obj/mojo/shell/public/cpp/cpp_for_chromium.ninja +++ b/obj/mojo/shell/public/cpp/cpp_for_chromium.ninja @@ -8,4 +8,5 @@ target_output_name = cpp_for_chromium ~ build obj/mojo/shell/public/cpp/cpp_for_chromium.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/shell/public/cpp/cpp_for_chromium.inputdeps.stamp: ~ build obj/mojo/shell/public/cpp/cpp_for_chromium.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/public/cpp/sources.ninja b/obj/mojo/shell/public/cpp/sources.ninja index c0d2192..0eee7d3 100644 --- a/obj/mojo/shell/public/cpp/sources.ninja +++ b/obj/mojo/shell/public/cpp/sources.ninja @@ -10,4 +10,5 @@ target_output_name = sources ~ build obj/mojo/shell/public/cpp/sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/shell/public/cpp/sources.inputdeps.stamp: ~ build obj/mojo/shell/public/cpp/sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/public/cpp/test_support.ninja b/obj/mojo/shell/public/cpp/test_support.ninja index 0d3f051..fea6df4 100644 --- a/obj/mojo/shell/public/cpp/test_support.ninja +++ b/obj/mojo/shell/public/cpp/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/mojo/shell/public/cpp/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,5 @@ build obj/mojo/shell/public/cpp/test_support.inputdeps.stamp: ~ build obj/mojo/shell/public/cpp/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/shell/public/cpp/tests/mojo_public_application_unittests.ninja b/obj/mojo/shell/public/cpp/tests/mojo_public_application_unittests.ninja index b8b7b61..0b57ec7 100644 --- a/obj/mojo/shell/public/cpp/tests/mojo_public_application_unittests.ninja +++ b/obj/mojo/shell/public/cpp/tests/mojo_public_application_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = mojo_public_application_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_application_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -650,7 +653,9 @@ build ./mojo_public_application_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/mojo/shell/public/cpp/tests/mojo_public_application_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/public/interfaces/interfaces.ninja b/obj/mojo/shell/public/interfaces/interfaces.ninja index fee519c..c609c91 100644 --- a/obj/mojo/shell/public/interfaces/interfaces.ninja +++ b/obj/mojo/shell/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/mojo/shell/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/shell/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/mojo/shell/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/shell/public/interfaces/interfaces_cpp_sources.ninja b/obj/mojo/shell/public/interfaces/interfaces_cpp_sources.ninja index 07accc7..1be83fc 100644 --- a/obj/mojo/shell/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/mojo/shell/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/mojo/shell/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/mojo/shell/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/mojo/shell/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/shell/shell.ninja b/obj/mojo/shell/shell.ninja index 4c99be5..1393ef8 100644 --- a/obj/mojo/shell/shell.ninja +++ b/obj/mojo/shell/shell.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_shell ~ build obj/mojo/shell/mojo_shell.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -71,4 +72,5 @@ build obj/mojo/shell/mojo_shell.stamp: ~ build obj/mojo/shell/shell.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/mojo/shell/test_bindings.ninja b/obj/mojo/shell/test_bindings.ninja index cd937a5..e032a15 100644 --- a/obj/mojo/shell/test_bindings.ninja +++ b/obj/mojo/shell/test_bindings.ninja @@ -8,4 +8,5 @@ target_output_name = test_bindings ~ build obj/mojo/shell/test_bindings.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/shell/test_bindings.inputdeps.stamp: ~ build obj/mojo/shell/test_bindings.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/shell/test_bindings_cpp_sources.ninja b/obj/mojo/shell/test_bindings_cpp_sources.ninja index 5d36d1e..74080f9 100644 --- a/obj/mojo/shell/test_bindings_cpp_sources.ninja +++ b/obj/mojo/shell/test_bindings_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = test_bindings_cpp_sources ~ build obj/mojo/shell/test_bindings_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/mojo/shell/test_bindings_cpp_sources.inputdeps.stamp: ~ build obj/mojo/shell/test_bindings_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/shell/test_support.ninja b/obj/mojo/shell/test_support.ninja index 20cca12..1cb892d 100644 --- a/obj/mojo/shell/test_support.ninja +++ b/obj/mojo/shell/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/mojo/shell/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/mojo/shell/test_support.inputdeps.stamp: ~ build obj/mojo/shell/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/mojo/test/test_support.ninja b/obj/mojo/test/test_support.ninja index 307eea3..6e46991 100644 --- a/obj/mojo/test/test_support.ninja +++ b/obj/mojo/test/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/mojo/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/mojo/test/test_support.inputdeps.stamp: ~ build obj/mojo/test/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/mojo/util/filename_util.ninja b/obj/mojo/util/filename_util.ninja index 99bcee3..9f0e145 100644 --- a/obj/mojo/util/filename_util.ninja +++ b/obj/mojo/util/filename_util.ninja @@ -10,4 +10,5 @@ target_output_name = filename_util ~ build obj/mojo/util/filename_util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/mojo/util/filename_util.inputdeps.stamp: ~ build obj/mojo/util/filename_util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/net/balsa.ninja b/obj/net/balsa.ninja index 8f8c1b5..98249bc 100644 --- a/obj/net/balsa.ninja +++ b/obj/net/balsa.ninja @@ -10,4 +10,5 @@ target_output_name = balsa ~ build obj/net/balsa.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/net/balsa.inputdeps.stamp: ~ build obj/net/balsa.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/crash_cache.ninja b/obj/net/crash_cache.ninja index fce7b73..c949c97 100644 --- a/obj/net/crash_cache.ninja +++ b/obj/net/crash_cache.ninja @@ -9,9 +9,12 @@ target_output_name = crash_cache ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./crash_cache.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1873,7 +1876,9 @@ build ./crash_cache.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/crash_cache.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/crl_set_dump.ninja b/obj/net/crl_set_dump.ninja index 91a0bc4..f13ae08 100644 --- a/obj/net/crl_set_dump.ninja +++ b/obj/net/crl_set_dump.ninja @@ -9,9 +9,12 @@ target_output_name = crl_set_dump ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./crl_set_dump.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./crl_set_dump.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/crl_set_dump.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/dns_fuzz_stub.ninja b/obj/net/dns_fuzz_stub.ninja index 2565da8..5f37a5d 100644 --- a/obj/net/dns_fuzz_stub.ninja +++ b/obj/net/dns_fuzz_stub.ninja @@ -9,9 +9,12 @@ target_output_name = dns_fuzz_stub ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./dns_fuzz_stub.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./dns_fuzz_stub.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/dns_fuzz_stub.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/dump_cache.ninja b/obj/net/dump_cache.ninja index c878249..3bc577a 100644 --- a/obj/net/dump_cache.ninja +++ b/obj/net/dump_cache.ninja @@ -9,9 +9,12 @@ target_output_name = dump_cache ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./dump_cache.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1874,7 +1877,9 @@ build ./dump_cache.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/dump_cache.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/extras.ninja b/obj/net/extras.ninja index 534660b..cc1a081 100644 --- a/obj/net/extras.ninja +++ b/obj/net/extras.ninja @@ -9,8 +9,9 @@ target_output_name = extras ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/net/extras.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/net/extras.inputdeps.stamp: build obj/net/extras.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -63,4 +66,5 @@ build obj/net/extras.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/net/gdig.ninja b/obj/net/gdig.ninja index ed0a8f7..1242c22 100644 --- a/obj/net/gdig.ninja +++ b/obj/net/gdig.ninja @@ -9,9 +9,12 @@ target_output_name = gdig ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gdig.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1367,7 +1370,9 @@ build ./gdig.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/gdig.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/get_server_time.ninja b/obj/net/get_server_time.ninja index a0f2223..172dfd8 100644 --- a/obj/net/get_server_time.ninja +++ b/obj/net/get_server_time.ninja @@ -9,9 +9,12 @@ target_output_name = get_server_time ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./get_server_time.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./get_server_time.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/get_server_time.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/hpack_example_generator.ninja b/obj/net/hpack_example_generator.ninja index 85f6104..4145af7 100644 --- a/obj/net/hpack_example_generator.ninja +++ b/obj/net/hpack_example_generator.ninja @@ -9,9 +9,12 @@ target_output_name = hpack_example_generator ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./hpack_example_generator.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./hpack_example_generator.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/hpack_example_generator.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/hpack_fuzz_mutator.ninja b/obj/net/hpack_fuzz_mutator.ninja index 1204cc8..87aae1f 100644 --- a/obj/net/hpack_fuzz_mutator.ninja +++ b/obj/net/hpack_fuzz_mutator.ninja @@ -9,9 +9,12 @@ target_output_name = hpack_fuzz_mutator ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./hpack_fuzz_mutator.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./hpack_fuzz_mutator.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/hpack_fuzz_mutator.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/hpack_fuzz_wrapper.ninja b/obj/net/hpack_fuzz_wrapper.ninja index d1b2b2e..a9ef38e 100644 --- a/obj/net/hpack_fuzz_wrapper.ninja +++ b/obj/net/hpack_fuzz_wrapper.ninja @@ -9,9 +9,12 @@ target_output_name = hpack_fuzz_wrapper ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./hpack_fuzz_wrapper.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1366,7 +1369,9 @@ build ./hpack_fuzz_wrapper.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/hpack_fuzz_wrapper.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/http_server.ninja b/obj/net/http_server.ninja index 21a08e1..7a4e691 100644 --- a/obj/net/http_server.ninja +++ b/obj/net/http_server.ninja @@ -9,8 +9,9 @@ target_output_name = http_server ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/net/http_server.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/net/http_server.inputdeps.stamp: build obj/net/http_server.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -65,4 +68,5 @@ build obj/net/http_server.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/net/interfaces/interfaces.ninja b/obj/net/interfaces/interfaces.ninja index 5268473..0d3f746 100644 --- a/obj/net/interfaces/interfaces.ninja +++ b/obj/net/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/net/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/net/interfaces/interfaces.inputdeps.stamp: ~ build obj/net/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/net/interfaces/interfaces_cpp_sources.ninja b/obj/net/interfaces/interfaces_cpp_sources.ninja index c242831..aea10d4 100644 --- a/obj/net/interfaces/interfaces_cpp_sources.ninja +++ b/obj/net/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/net/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/net/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/net/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/net/mojo_type_converters.ninja b/obj/net/mojo_type_converters.ninja index 4dd874c..780f032 100644 --- a/obj/net/mojo_type_converters.ninja +++ b/obj/net/mojo_type_converters.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_type_converters ~ build obj/net/mojo_type_converters.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/net/mojo_type_converters.inputdeps.stamp: ~ build obj/net/mojo_type_converters.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/net.ninja b/obj/net/net.ninja index b76e0ac..7b76eab 100644 --- a/obj/net/net.ninja +++ b/obj/net/net.ninja @@ -12,4 +12,5 @@ target_output_name = net ~ build obj/net/net.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/net/net.inputdeps.stamp: ~ build obj/net/net.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/net_browser_services.ninja b/obj/net/net_browser_services.ninja index 23fd04e..f4f8c59 100644 --- a/obj/net/net_browser_services.ninja +++ b/obj/net/net_browser_services.ninja @@ -10,4 +10,5 @@ target_output_name = net_browser_services ~ build obj/net/net_browser_services.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/net/net_browser_services.inputdeps.stamp: ~ build obj/net/net_browser_services.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/net_perftests.ninja b/obj/net/net_perftests.ninja index ec24645..7b5c7c4 100644 --- a/obj/net/net_perftests.ninja +++ b/obj/net/net_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = net_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./net_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1892,7 +1895,9 @@ build ./net_perftests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/net_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/net_utility_services.ninja b/obj/net/net_utility_services.ninja index ad0a3a1..9cbce6f 100644 --- a/obj/net/net_utility_services.ninja +++ b/obj/net/net_utility_services.ninja @@ -10,4 +10,5 @@ target_output_name = net_utility_services ~ build obj/net/net_utility_services.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/net/net_utility_services.inputdeps.stamp: ~ build obj/net/net_utility_services.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/net_watcher.ninja b/obj/net/net_watcher.ninja index 5b86ec9..31088d3 100644 --- a/obj/net/net_watcher.ninja +++ b/obj/net/net_watcher.ninja @@ -9,9 +9,12 @@ target_output_name = net_watcher ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./net_watcher.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1779,7 +1782,9 @@ build ./net_watcher.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/net_watcher.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/net_with_v8.ninja b/obj/net/net_with_v8.ninja index 433ba4e..29f9741 100644 --- a/obj/net/net_with_v8.ninja +++ b/obj/net/net_with_v8.ninja @@ -10,4 +10,5 @@ target_output_name = net_with_v8 ~ build obj/net/net_with_v8.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/net/net_with_v8.inputdeps.stamp: ~ build obj/net/net_with_v8.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/quic_client.ninja b/obj/net/quic_client.ninja index a20e2d9..2c0da36 100644 --- a/obj/net/quic_client.ninja +++ b/obj/net/quic_client.ninja @@ -9,9 +9,12 @@ target_output_name = quic_client ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./quic_client.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1390,7 +1393,9 @@ build ./quic_client.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/quic_client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/quic_server.ninja b/obj/net/quic_server.ninja index 5310a69..72443f8 100644 --- a/obj/net/quic_server.ninja +++ b/obj/net/quic_server.ninja @@ -9,9 +9,12 @@ target_output_name = quic_server ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./quic_server.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1390,7 +1393,9 @@ build ./quic_server.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/quic_server.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/run_testserver.ninja b/obj/net/run_testserver.ninja index 1c6b67e..7c18eae 100644 --- a/obj/net/run_testserver.ninja +++ b/obj/net/run_testserver.ninja @@ -9,9 +9,12 @@ target_output_name = run_testserver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./run_testserver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1873,7 +1876,9 @@ build ./run_testserver.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/run_testserver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/simple_quic_tools.ninja b/obj/net/simple_quic_tools.ninja index 349ff60..a5993e6 100644 --- a/obj/net/simple_quic_tools.ninja +++ b/obj/net/simple_quic_tools.ninja @@ -10,4 +10,5 @@ target_output_name = simple_quic_tools ~ build obj/net/simple_quic_tools.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/net/simple_quic_tools.inputdeps.stamp: ~ build obj/net/simple_quic_tools.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/stale_while_revalidate_experiment_domains.ninja b/obj/net/stale_while_revalidate_experiment_domains.ninja index 0d9c97e..66c6a3e 100644 --- a/obj/net/stale_while_revalidate_experiment_domains.ninja +++ b/obj/net/stale_while_revalidate_experiment_domains.ninja @@ -12,4 +12,5 @@ target_output_name = stale_while_revalidate_experiment_domains ~ build obj/net/stale_while_revalidate_experiment_domains.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/net/stale_while_revalidate_experiment_domains.inputdeps.stamp: ~ build obj/net/stale_while_revalidate_experiment_domains.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/stress_cache.ninja b/obj/net/stress_cache.ninja index 43b4c25..b8c6082 100644 --- a/obj/net/stress_cache.ninja +++ b/obj/net/stress_cache.ninja @@ -9,9 +9,12 @@ target_output_name = stress_cache ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./stress_cache.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1873,7 +1876,9 @@ build ./stress_cache.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/net/stress_cache.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/test_support.ninja b/obj/net/test_support.ninja index 67d8db0..b919a00 100644 --- a/obj/net/test_support.ninja +++ b/obj/net/test_support.ninja @@ -12,4 +12,5 @@ target_output_name = test_support ~ build obj/net/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,5 @@ build obj/net/test_support.inputdeps.stamp: ~ build obj/net/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/net/tld_cleanup.ninja b/obj/net/tld_cleanup.ninja index 7a142c9..42391b0 100644 --- a/obj/net/tld_cleanup.ninja +++ b/obj/net/tld_cleanup.ninja @@ -9,9 +9,12 @@ target_output_name = tld_cleanup ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./tld_cleanup.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -431,7 +434,9 @@ build ./tld_cleanup.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/net/tld_cleanup.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/net/tools/tld_cleanup/tld_cleanup.ninja b/obj/net/tools/tld_cleanup/tld_cleanup.ninja index 8708858..5bf73dd 100644 --- a/obj/net/tools/tld_cleanup/tld_cleanup.ninja +++ b/obj/net/tools/tld_cleanup/tld_cleanup.ninja @@ -10,4 +10,5 @@ target_output_name = tld_cleanup ~ build obj/net/tools/tld_cleanup/tld_cleanup.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/net/tools/tld_cleanup/tld_cleanup.inputdeps.stamp: ~ build obj/net/tools/tld_cleanup/tld_cleanup.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/pdf/pdf.ninja b/obj/pdf/pdf.ninja index 72f5121..b61a3bd 100644 --- a/obj/pdf/pdf.ninja +++ b/obj/pdf/pdf.ninja @@ -9,8 +9,9 @@ target_output_name = pdf ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib winmm.lib ws2_32.lib advapi32.lib gdi32.lib user32.lib ~ output_extension = .lib ~ build obj/pdf/pdf.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -46,4 +47,6 @@ build obj/pdf/pdf.inputdeps.stamp: build obj/pdf/pdf.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -110,4 +113,5 @@ build obj/pdf/pdf.lib: obj/v8/v8_external_snapshot.stamp ~ obj/v8/v8_libbase.stamp ~ +| ~ || ~ ~ diff --git a/obj/ppapi/blink_test_plugin.ninja b/obj/ppapi/blink_test_plugin.ninja index ebdb09f..f254000 100644 --- a/obj/ppapi/blink_test_plugin.ninja +++ b/obj/ppapi/blink_test_plugin.ninja @@ -9,8 +9,11 @@ target_output_name = blink_test_plugin ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .dll ~ build ./blink_test_plugin.dll: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2632,7 +2635,9 @@ build ./blink_test_plugin.dll: obj/url/url_lib.stamp ~ solink_module ~ +| ~ || ~ ~ build obj/ppapi/blink_test_plugin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/host/host.ninja b/obj/ppapi/host/host.ninja index e675d1c..45d386f 100644 --- a/obj/ppapi/host/host.ninja +++ b/obj/ppapi/host/host.ninja @@ -10,4 +10,5 @@ target_output_name = ppapi_host ~ build obj/ppapi/host/host.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -96,4 +97,5 @@ build obj/ppapi/host/host/resource_message_handler.obj: ~ build obj/ppapi/host/ppapi_host.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ppapi/pepper_hash_for_uma.ninja b/obj/ppapi/pepper_hash_for_uma.ninja index e709ce2..042cc7e 100644 --- a/obj/ppapi/pepper_hash_for_uma.ninja +++ b/obj/ppapi/pepper_hash_for_uma.ninja @@ -9,9 +9,12 @@ target_output_name = pepper_hash_for_uma ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./pepper_hash_for_uma.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -22,7 +25,9 @@ build ./pepper_hash_for_uma.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/ppapi/pepper_hash_for_uma.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/power_saver_test_plugin.ninja b/obj/ppapi/power_saver_test_plugin.ninja index 90dd16d..a6cdde7 100644 --- a/obj/ppapi/power_saver_test_plugin.ninja +++ b/obj/ppapi/power_saver_test_plugin.ninja @@ -9,8 +9,11 @@ target_output_name = power_saver_test_plugin ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .dll ~ build ./power_saver_test_plugin.dll ./power_saver_test_plugin.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2633,7 +2636,9 @@ build ./power_saver_test_plugin.dll ./power_saver_test_plugin.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/ppapi/power_saver_test_plugin.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/ppapi_perftests.ninja b/obj/ppapi/ppapi_perftests.ninja index a8b20c8..57733e9 100644 --- a/obj/ppapi/ppapi_perftests.ninja +++ b/obj/ppapi/ppapi_perftests.ninja @@ -9,5 +9,5 @@ target_output_name = ppapi_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ diff --git a/obj/ppapi/ppapi_tests.ninja b/obj/ppapi/ppapi_tests.ninja index 6e05d20..d44c5fa 100644 --- a/obj/ppapi/ppapi_tests.ninja +++ b/obj/ppapi/ppapi_tests.ninja @@ -14,8 +14,11 @@ target_output_name = ppapi_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .dll ~ build ./ppapi_tests.dll ./ppapi_tests.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2724,7 +2727,9 @@ build ./ppapi_tests.dll ./ppapi_tests.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/ppapi/ppapi_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/ppapi_unittests.ninja b/obj/ppapi/ppapi_unittests.ninja index 39fcd21..ab6af52 100644 --- a/obj/ppapi/ppapi_unittests.ninja +++ b/obj/ppapi/ppapi_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = ppapi_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ diff --git a/obj/ppapi/proxy/ipc_sources.ninja b/obj/ppapi/proxy/ipc_sources.ninja index 18eb7de..c73c8ce 100644 --- a/obj/ppapi/proxy/ipc_sources.ninja +++ b/obj/ppapi/proxy/ipc_sources.ninja @@ -10,4 +10,5 @@ target_output_name = ipc_sources ~ build obj/ppapi/proxy/ipc_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ppapi/proxy/ipc_sources.inputdeps.stamp: ~ build obj/ppapi/proxy/ipc_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ppapi/proxy/proxy.ninja b/obj/ppapi/proxy/proxy.ninja index 6af1376..8fe6841 100644 --- a/obj/ppapi/proxy/proxy.ninja +++ b/obj/ppapi/proxy/proxy.ninja @@ -12,4 +12,5 @@ target_output_name = ppapi_proxy ~ build obj/ppapi/proxy/ppapi_proxy.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -200,4 +201,5 @@ build obj/ppapi/proxy/ppapi_proxy.stamp: ~ build obj/ppapi/proxy/proxy.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/proxy/test_support.ninja b/obj/ppapi/proxy/test_support.ninja index 52d887f..72fe6cb 100644 --- a/obj/ppapi/proxy/test_support.ninja +++ b/obj/ppapi/proxy/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ppapi/proxy/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/ppapi/proxy/test_support.inputdeps.stamp: ~ build obj/ppapi/proxy/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ppapi/shared_impl/shared_impl.ninja b/obj/ppapi/shared_impl/shared_impl.ninja index 84f34db..fc83872 100644 --- a/obj/ppapi/shared_impl/shared_impl.ninja +++ b/obj/ppapi/shared_impl/shared_impl.ninja @@ -12,4 +12,5 @@ target_output_name = ppapi_shared ~ build obj/ppapi/shared_impl/ppapi_shared.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -146,4 +147,5 @@ build obj/ppapi/shared_impl/ppapi_shared.stamp: ~ build obj/ppapi/shared_impl/shared_impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ppapi/shared_impl/test_support.ninja b/obj/ppapi/shared_impl/test_support.ninja index afa1c6d..65b6b6d 100644 --- a/obj/ppapi/shared_impl/test_support.ninja +++ b/obj/ppapi/shared_impl/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ppapi/shared_impl/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/ppapi/shared_impl/test_support.inputdeps.stamp: ~ build obj/ppapi/shared_impl/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/printing/printing.ninja b/obj/printing/printing.ninja index d7246fb..562549b 100644 --- a/obj/printing/printing.ninja +++ b/obj/printing/printing.ninja @@ -10,4 +10,5 @@ target_output_name = printing ~ build obj/printing/printing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/printing/printing.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/printing/printing_unittests.ninja b/obj/printing/printing_unittests.ninja index 9764f0e..df1a8db 100644 --- a/obj/printing/printing_unittests.ninja +++ b/obj/printing/printing_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = printing_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/remoting/base/base.ninja b/obj/remoting/base/base.ninja index 4b5daf8..8a82324 100644 --- a/obj/remoting/base/base.ninja +++ b/obj/remoting/base/base.ninja @@ -10,4 +10,5 @@ target_output_name = base ~ build obj/remoting/base/base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/remoting/base/base.inputdeps.stamp: ~ build obj/remoting/base/base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/base/breakpad.ninja b/obj/remoting/base/breakpad.ninja index 1c59450..5a0a76f 100644 --- a/obj/remoting/base/breakpad.ninja +++ b/obj/remoting/base/breakpad.ninja @@ -10,4 +10,5 @@ target_output_name = breakpad ~ build obj/remoting/base/breakpad.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/remoting/base/breakpad.inputdeps.stamp: ~ build obj/remoting/base/breakpad.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/remoting/base/unit_tests.ninja b/obj/remoting/base/unit_tests.ninja index 7642963..3219cb7 100644 --- a/obj/remoting/base/unit_tests.ninja +++ b/obj/remoting/base/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/base/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/remoting/base/unit_tests.inputdeps.stamp: ~ build obj/remoting/base/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/client/client.ninja b/obj/remoting/client/client.ninja index 7161fcd..e4dbacc 100644 --- a/obj/remoting/client/client.ninja +++ b/obj/remoting/client/client.ninja @@ -10,4 +10,5 @@ target_output_name = client ~ build obj/remoting/client/client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/client/client.inputdeps.stamp: ~ build obj/remoting/client/client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/client/unit_tests.ninja b/obj/remoting/client/unit_tests.ninja index 7058dbe..e6ad6e5 100644 --- a/obj/remoting/client/unit_tests.ninja +++ b/obj/remoting/client/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/client/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/client/unit_tests.inputdeps.stamp: ~ build obj/remoting/client/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/codec/codec.ninja b/obj/remoting/codec/codec.ninja index a327aac..42482f3 100644 --- a/obj/remoting/codec/codec.ninja +++ b/obj/remoting/codec/codec.ninja @@ -10,4 +10,5 @@ target_output_name = codec ~ build obj/remoting/codec/codec.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/remoting/codec/codec.inputdeps.stamp: ~ build obj/remoting/codec/codec.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/codec/unit_tests.ninja b/obj/remoting/codec/unit_tests.ninja index 0635270..7f6c2b3 100644 --- a/obj/remoting/codec/unit_tests.ninja +++ b/obj/remoting/codec/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/codec/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/remoting/codec/unit_tests.inputdeps.stamp: ~ build obj/remoting/codec/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/protocol/protocol.ninja b/obj/remoting/protocol/protocol.ninja index 48fe9dc..46e98df 100644 --- a/obj/remoting/protocol/protocol.ninja +++ b/obj/remoting/protocol/protocol.ninja @@ -12,4 +12,5 @@ target_output_name = protocol ~ build obj/remoting/protocol/protocol.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -45,4 +46,5 @@ build obj/remoting/protocol/protocol.inputdeps.stamp: ~ build obj/remoting/protocol/protocol.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/protocol/test_support.ninja b/obj/remoting/protocol/test_support.ninja index 9f988ad..73045c3 100644 --- a/obj/remoting/protocol/test_support.ninja +++ b/obj/remoting/protocol/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/remoting/protocol/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/protocol/test_support.inputdeps.stamp: ~ build obj/remoting/protocol/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/protocol/unit_tests.ninja b/obj/remoting/protocol/unit_tests.ninja index 4ef7621..ef71565 100644 --- a/obj/remoting/protocol/unit_tests.ninja +++ b/obj/remoting/protocol/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/protocol/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/protocol/unit_tests.inputdeps.stamp: ~ build obj/remoting/protocol/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/remoting_unittests.ninja b/obj/remoting/remoting_unittests.ninja index 432c1b1..e752765 100644 --- a/obj/remoting/remoting_unittests.ninja +++ b/obj/remoting/remoting_unittests.ninja @@ -7,5 +7,5 @@ target_output_name = remoting_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib rpcrt4.lib ~ output_extension = .exe ~ diff --git a/obj/remoting/signaling/signaling.ninja b/obj/remoting/signaling/signaling.ninja index 5bc8cc1..c024539 100644 --- a/obj/remoting/signaling/signaling.ninja +++ b/obj/remoting/signaling/signaling.ninja @@ -10,4 +10,5 @@ target_output_name = signaling ~ build obj/remoting/signaling/signaling.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/remoting/signaling/signaling.inputdeps.stamp: ~ build obj/remoting/signaling/signaling.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/signaling/test_support.ninja b/obj/remoting/signaling/test_support.ninja index 7b325ca..4e5058e 100644 --- a/obj/remoting/signaling/test_support.ninja +++ b/obj/remoting/signaling/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/remoting/signaling/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/remoting/signaling/test_support.inputdeps.stamp: ~ build obj/remoting/signaling/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/signaling/unit_tests.ninja b/obj/remoting/signaling/unit_tests.ninja index 00b7ed1..906ef26 100644 --- a/obj/remoting/signaling/unit_tests.ninja +++ b/obj/remoting/signaling/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/signaling/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -37,4 +38,5 @@ build obj/remoting/signaling/unit_tests.inputdeps.stamp: ~ build obj/remoting/signaling/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/test/ar_sample_test_driver.ninja b/obj/remoting/test/ar_sample_test_driver.ninja index d3d0a25..fcea733 100644 --- a/obj/remoting/test/ar_sample_test_driver.ninja +++ b/obj/remoting/test/ar_sample_test_driver.ninja @@ -9,9 +9,12 @@ target_output_name = ar_sample_test_driver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .exe ~ build ./ar_sample_test_driver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3629,7 +3632,9 @@ build ./ar_sample_test_driver.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/remoting/test/ar_sample_test_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/remoting/test/ar_test_driver_common.ninja b/obj/remoting/test/ar_test_driver_common.ninja index 4dbb88e..091a511 100644 --- a/obj/remoting/test/ar_test_driver_common.ninja +++ b/obj/remoting/test/ar_test_driver_common.ninja @@ -10,4 +10,5 @@ target_output_name = ar_test_driver_common ~ build obj/remoting/test/ar_test_driver_common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/test/ar_test_driver_common.inputdeps.stamp: ~ build obj/remoting/test/ar_test_driver_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/test/chromoting_test_driver.ninja b/obj/remoting/test/chromoting_test_driver.ninja index 34a9526..08394f1 100644 --- a/obj/remoting/test/chromoting_test_driver.ninja +++ b/obj/remoting/test/chromoting_test_driver.ninja @@ -9,9 +9,12 @@ target_output_name = chromoting_test_driver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .exe ~ build ./chromoting_test_driver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3623,7 +3626,9 @@ build ./chromoting_test_driver.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/remoting/test/chromoting_test_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/remoting/test/test_support.ninja b/obj/remoting/test/test_support.ninja index 81271c7..5d9f36e 100644 --- a/obj/remoting/test/test_support.ninja +++ b/obj/remoting/test/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/remoting/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/remoting/test/test_support.inputdeps.stamp: ~ build obj/remoting/test/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/test/unit_tests.ninja b/obj/remoting/test/unit_tests.ninja index dd499e0..77d7491 100644 --- a/obj/remoting/test/unit_tests.ninja +++ b/obj/remoting/test/unit_tests.ninja @@ -10,4 +10,5 @@ target_output_name = unit_tests ~ build obj/remoting/test/unit_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -53,4 +54,5 @@ build obj/remoting/test/unit_tests.inputdeps.stamp: ~ build obj/remoting/test/unit_tests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/remoting/test_support.ninja b/obj/remoting/test_support.ninja index 714c155..7d2b3d9 100644 --- a/obj/remoting/test_support.ninja +++ b/obj/remoting/test_support.ninja @@ -8,4 +8,5 @@ target_output_name = test_support ~ build obj/remoting/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -64,4 +65,5 @@ build obj/remoting/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/rlz/rlz.ninja b/obj/rlz/rlz.ninja index e64bc10..06e2d43 100644 --- a/obj/rlz/rlz.ninja +++ b/obj/rlz/rlz.ninja @@ -9,8 +9,11 @@ target_output_name = rlz ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./rlz.dll ./rlz.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1384,7 +1387,9 @@ build ./rlz.dll ./rlz.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/rlz/rlz.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/rlz/rlz_id.ninja b/obj/rlz/rlz_id.ninja index c187415..f0addaf 100644 --- a/obj/rlz/rlz_id.ninja +++ b/obj/rlz/rlz_id.ninja @@ -9,9 +9,12 @@ target_output_name = rlz_id ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./rlz_id.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1383,7 +1386,9 @@ build ./rlz_id.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/rlz/rlz_id.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/rlz/rlz_lib.ninja b/obj/rlz/rlz_lib.ninja index 588bb6d..6da7b1b 100644 --- a/obj/rlz/rlz_lib.ninja +++ b/obj/rlz/rlz_lib.ninja @@ -10,4 +10,5 @@ target_output_name = rlz_lib ~ build obj/rlz/rlz_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/rlz/rlz_lib.inputdeps.stamp: ~ build obj/rlz/rlz_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/rlz/rlz_unittests.ninja b/obj/rlz/rlz_unittests.ninja index fbf481f..d952520 100644 --- a/obj/rlz/rlz_unittests.ninja +++ b/obj/rlz/rlz_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = rlz_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./rlz_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1902,7 +1905,9 @@ build ./rlz_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/rlz/rlz_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/rlz/test_support.ninja b/obj/rlz/test_support.ninja index dba7ec2..4e68122 100644 --- a/obj/rlz/test_support.ninja +++ b/obj/rlz/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/rlz/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/rlz/test_support.inputdeps.stamp: ~ build obj/rlz/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/sandbox/win/sandbox.ninja b/obj/sandbox/win/sandbox.ninja index ff43ca2..4953b08 100644 --- a/obj/sandbox/win/sandbox.ninja +++ b/obj/sandbox/win/sandbox.ninja @@ -11,8 +11,9 @@ target_output_name = sandbox ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sandbox/win/sandbox.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,6 @@ build obj/sandbox/win/sandbox.inputdeps.stamp: build obj/sandbox/win/sandbox.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -88,4 +91,5 @@ build obj/sandbox/win/sandbox.lib: obj/sandbox/win/sandbox/window.obj ~ obj/third_party/modp_b64/modp_b64.stamp ~ +| ~ || ~ ~ diff --git a/obj/sandbox/win/sandbox_poc.ninja b/obj/sandbox/win/sandbox_poc.ninja index aace0ed..06bcc0e 100644 --- a/obj/sandbox/win/sandbox_poc.ninja +++ b/obj/sandbox/win/sandbox_poc.ninja @@ -9,10 +9,13 @@ target_output_name = sandbox_poc ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = comctl32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./sandbox_poc.exe: ~ ./pocdll.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./sandbox_poc.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/sandbox/win/sandbox_poc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sandbox/win/sbox_integration_tests.ninja b/obj/sandbox/win/sbox_integration_tests.ninja index 8272fb5..b1f6a67 100644 --- a/obj/sandbox/win/sbox_integration_tests.ninja +++ b/obj/sandbox/win/sbox_integration_tests.ninja @@ -9,9 +9,12 @@ target_output_name = sbox_integration_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./sbox_integration_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -478,7 +481,9 @@ build ./sbox_integration_tests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/sandbox/win/sbox_integration_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sandbox/win/sbox_unittests.ninja b/obj/sandbox/win/sbox_unittests.ninja index d52be5d..ed29069 100644 --- a/obj/sandbox/win/sbox_unittests.ninja +++ b/obj/sandbox/win/sbox_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = sbox_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./sbox_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -473,7 +476,9 @@ build ./sbox_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/sandbox/win/sbox_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sandbox/win/sbox_validation_tests.ninja b/obj/sandbox/win/sbox_validation_tests.ninja index 82a78cb..8e4307b 100644 --- a/obj/sandbox/win/sbox_validation_tests.ninja +++ b/obj/sandbox/win/sbox_validation_tests.ninja @@ -9,9 +9,12 @@ target_output_name = sbox_validation_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./sbox_validation_tests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -462,7 +465,9 @@ build ./sbox_validation_tests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/sandbox/win/sbox_validation_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sdch/sdch.ninja b/obj/sdch/sdch.ninja index 79ff7dd..e2af653 100644 --- a/obj/sdch/sdch.ninja +++ b/obj/sdch/sdch.ninja @@ -9,8 +9,9 @@ target_output_name = sdch ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sdch/sdch.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/sdch/sdch.inputdeps.stamp: build obj/sdch/sdch.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -38,4 +41,5 @@ build obj/sdch/sdch.lib: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ diff --git a/obj/skia/public/interfaces/interfaces.ninja b/obj/skia/public/interfaces/interfaces.ninja index 2134246..19eaed8 100644 --- a/obj/skia/public/interfaces/interfaces.ninja +++ b/obj/skia/public/interfaces/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/skia/public/interfaces/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/skia/public/interfaces/interfaces.inputdeps.stamp: ~ build obj/skia/public/interfaces/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/skia/public/interfaces/interfaces_cpp_sources.ninja b/obj/skia/public/interfaces/interfaces_cpp_sources.ninja index a6b0fdb..0e9569a 100644 --- a/obj/skia/public/interfaces/interfaces_cpp_sources.ninja +++ b/obj/skia/public/interfaces/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/skia/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/skia/public/interfaces/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/skia/public/interfaces/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/skia/public/public.ninja b/obj/skia/public/public.ninja index d327203..43781d2 100644 --- a/obj/skia/public/public.ninja +++ b/obj/skia/public/public.ninja @@ -10,4 +10,5 @@ target_output_name = public ~ build obj/skia/public/public.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -18,4 +19,5 @@ build obj/skia/public/public.inputdeps.stamp: ~ build obj/skia/public/public.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/skia/skia.ninja b/obj/skia/skia.ninja index f9c920f..a9c43ab 100644 --- a/obj/skia/skia.ninja +++ b/obj/skia/skia.ninja @@ -10,4 +10,5 @@ target_output_name = skia ~ build obj/skia/skia.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/skia/skia.inputdeps.stamp: ~ build obj/skia/skia.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/skia/skia_opts.ninja b/obj/skia/skia_opts.ninja index ffd9e5d..db0aca9 100644 --- a/obj/skia/skia_opts.ninja +++ b/obj/skia/skia_opts.ninja @@ -10,4 +10,5 @@ target_output_name = skia_opts ~ build obj/skia/skia_opts.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/skia/skia_opts.inputdeps.stamp: ~ build obj/skia/skia_opts.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/skia/skia_unittests.ninja b/obj/skia/skia_unittests.ninja index 376715a..aa4fdac 100644 --- a/obj/skia/skia_unittests.ninja +++ b/obj/skia/skia_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = skia_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./skia_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3565,7 +3568,9 @@ build ./skia_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/skia/skia_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sql/mojo/apptests.ninja b/obj/sql/mojo/apptests.ninja index 0d63796..a70a8cb 100644 --- a/obj/sql/mojo/apptests.ninja +++ b/obj/sql/mojo/apptests.ninja @@ -1,4 +1,5 @@ ~ build obj/sql/mojo/apptests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sql/mojo/mojo.ninja b/obj/sql/mojo/mojo.ninja index 33d10b6..d73913d 100644 --- a/obj/sql/mojo/mojo.ninja +++ b/obj/sql/mojo/mojo.ninja @@ -10,4 +10,5 @@ target_output_name = mojo ~ build obj/sql/mojo/mojo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,5 @@ build obj/sql/mojo/mojo.inputdeps.stamp: ~ build obj/sql/mojo/mojo.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/sql/mojo/sql_apptests_library.ninja b/obj/sql/mojo/sql_apptests_library.ninja index 292dee8..2275952 100644 --- a/obj/sql/mojo/sql_apptests_library.ninja +++ b/obj/sql/mojo/sql_apptests_library.ninja @@ -9,9 +9,12 @@ target_output_name = sql_apptests_library ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .dll ~ build ./sql_apptests_library.dll ./sql_apptests_library.dll.lib: ~ ./mojo_runner.exe ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -618,7 +621,9 @@ build ./sql_apptests_library.dll ./sql_apptests_library.dll.lib: obj/url/url_lib.stamp ~ solink ~ +| ~ || ~ ~ build obj/sql/mojo/sql_apptests_library.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sql/sql.ninja b/obj/sql/sql.ninja index 9b5b424..b3521b3 100644 --- a/obj/sql/sql.ninja +++ b/obj/sql/sql.ninja @@ -10,4 +10,5 @@ target_output_name = sql ~ build obj/sql/sql.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/sql/sql.inputdeps.stamp: ~ build obj/sql/sql.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/sql/test_support.ninja b/obj/sql/test_support.ninja index 0c2835b..20b8a95 100644 --- a/obj/sql/test_support.ninja +++ b/obj/sql/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/sql/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/sql/test_support.inputdeps.stamp: ~ build obj/sql/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/storage/browser/browser.ninja b/obj/storage/browser/browser.ninja index 583a1b3..bca0f46 100644 --- a/obj/storage/browser/browser.ninja +++ b/obj/storage/browser/browser.ninja @@ -12,4 +12,5 @@ target_output_name = storage_browser ~ build obj/storage/browser/browser.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -674,4 +675,5 @@ build obj/storage/browser/browser/view_blob_internals_job.obj: ~ build obj/storage/browser/storage_browser.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/storage/browser/dump_file_system.ninja b/obj/storage/browser/dump_file_system.ninja index cc324ad..0a90d21 100644 --- a/obj/storage/browser/dump_file_system.ninja +++ b/obj/storage/browser/dump_file_system.ninja @@ -9,9 +9,12 @@ target_output_name = dump_file_system ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./dump_file_system.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1471,7 +1474,9 @@ build ./dump_file_system.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/storage/browser/dump_file_system.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/storage/common/common.ninja b/obj/storage/common/common.ninja index 9b9efc3..f7faf6b 100644 --- a/obj/storage/common/common.ninja +++ b/obj/storage/common/common.ninja @@ -10,4 +10,5 @@ target_output_name = storage_common ~ build obj/storage/common/common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -88,4 +89,5 @@ build obj/storage/common/common/quota_status_code.obj: ~ build obj/storage/common/storage_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/sync/run_sync_testserver.ninja b/obj/sync/run_sync_testserver.ninja index 0416221..b0dadfa 100644 --- a/obj/sync/run_sync_testserver.ninja +++ b/obj/sync/run_sync_testserver.ninja @@ -9,9 +9,12 @@ target_output_name = run_sync_testserver ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./run_sync_testserver.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2157,7 +2160,9 @@ build ./run_sync_testserver.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/sync/run_sync_testserver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/sync/sync.ninja b/obj/sync/sync.ninja index 5221975..721bf78 100644 --- a/obj/sync/sync.ninja +++ b/obj/sync/sync.ninja @@ -8,4 +8,5 @@ target_output_name = sync ~ build obj/sync/sync.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -34,4 +35,5 @@ build obj/sync/sync.inputdeps.stamp: ~ build obj/sync/sync.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/sync/sync_core.ninja b/obj/sync/sync_core.ninja index 89e8ba2..eb61023 100644 --- a/obj/sync/sync_core.ninja +++ b/obj/sync/sync_core.ninja @@ -12,4 +12,5 @@ target_output_name = sync_core ~ build obj/sync/sync_core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/sync/sync_core.inputdeps.stamp: ~ build obj/sync/sync_core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/sync/test_support_sync_api.ninja b/obj/sync/test_support_sync_api.ninja index 16a864a..13e6e2a 100644 --- a/obj/sync/test_support_sync_api.ninja +++ b/obj/sync/test_support_sync_api.ninja @@ -9,8 +9,9 @@ target_output_name = test_support_sync_api ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sync/test_support_sync_api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/sync/test_support_sync_api.inputdeps.stamp: build obj/sync/test_support_sync_api.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -79,4 +82,5 @@ build obj/sync/test_support_sync_api.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/sync/test_support_sync_core.ninja b/obj/sync/test_support_sync_core.ninja index fa9a056..58e5583 100644 --- a/obj/sync/test_support_sync_core.ninja +++ b/obj/sync/test_support_sync_core.ninja @@ -9,8 +9,9 @@ target_output_name = test_support_sync_core ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sync/test_support_sync_core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/sync/test_support_sync_core.inputdeps.stamp: build obj/sync/test_support_sync_core.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -101,4 +104,5 @@ build obj/sync/test_support_sync_core.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/sync/test_support_sync_fake_server.ninja b/obj/sync/test_support_sync_fake_server.ninja index 2b02ddf..0eec5b3 100644 --- a/obj/sync/test_support_sync_fake_server.ninja +++ b/obj/sync/test_support_sync_fake_server.ninja @@ -9,8 +9,9 @@ target_output_name = test_support_sync_fake_server ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sync/test_support_sync_fake_server.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/sync/test_support_sync_fake_server.inputdeps.stamp: build obj/sync/test_support_sync_fake_server.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -86,4 +89,5 @@ build obj/sync/test_support_sync_fake_server.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/sync/test_support_sync_internal_api.ninja b/obj/sync/test_support_sync_internal_api.ninja index 144ea40..ea00bdb 100644 --- a/obj/sync/test_support_sync_internal_api.ninja +++ b/obj/sync/test_support_sync_internal_api.ninja @@ -9,8 +9,9 @@ target_output_name = test_support_sync_internal_api ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/sync/test_support_sync_internal_api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -40,4 +41,6 @@ build obj/sync/test_support_sync_internal_api.inputdeps.stamp: build obj/sync/test_support_sync_internal_api.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -85,4 +88,5 @@ build obj/sync/test_support_sync_internal_api.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/sync/test_support_sync_testserver.ninja b/obj/sync/test_support_sync_testserver.ninja index ed25dbb..2d355da 100644 --- a/obj/sync/test_support_sync_testserver.ninja +++ b/obj/sync/test_support_sync_testserver.ninja @@ -9,8 +9,9 @@ target_output_name = test_support_sync_testserver ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/sync/test_support_sync_testserver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -50,4 +51,6 @@ build obj/sync/test_support_sync_testserver.inputdeps.stamp: build obj/sync/test_support_sync_testserver.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -95,4 +98,5 @@ build obj/sync/test_support_sync_testserver.lib: obj/v8/v8_external_snapshot.stamp ~ obj/v8/v8_libbase.stamp ~ +| ~ || ~ ~ diff --git a/obj/testing/perf/perf.ninja b/obj/testing/perf/perf.ninja index fe87b6b..fd00146 100644 --- a/obj/testing/perf/perf.ninja +++ b/obj/testing/perf/perf.ninja @@ -10,4 +10,5 @@ target_output_name = perf ~ build obj/testing/perf/perf.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/testing/perf/perf.inputdeps.stamp: ~ build obj/testing/perf/perf.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/WebKit/Source/core/core.ninja b/obj/third_party/WebKit/Source/core/core.ninja index 2a5d0ac..81407ce 100644 --- a/obj/third_party/WebKit/Source/core/core.ninja +++ b/obj/third_party/WebKit/Source/core/core.ninja @@ -8,4 +8,5 @@ target_output_name = core ~ build obj/third_party/WebKit/Source/core/core.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -119,4 +120,5 @@ build obj/third_party/WebKit/Source/core/core.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/core.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/core_generated.ninja b/obj/third_party/WebKit/Source/core/core_generated.ninja index 028914e..5259f8a 100644 --- a/obj/third_party/WebKit/Source/core/core_generated.ninja +++ b/obj/third_party/WebKit/Source/core/core_generated.ninja @@ -10,4 +10,5 @@ target_output_name = core_generated ~ build obj/third_party/WebKit/Source/core/core_generated.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -121,4 +122,5 @@ build obj/third_party/WebKit/Source/core/core_generated.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/core_generated.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/dom.ninja b/obj/third_party/WebKit/Source/core/dom.ninja index 6ee5521..c5b1872 100644 --- a/obj/third_party/WebKit/Source/core/dom.ninja +++ b/obj/third_party/WebKit/Source/core/dom.ninja @@ -10,4 +10,5 @@ target_output_name = dom ~ build obj/third_party/WebKit/Source/core/dom.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -116,4 +117,5 @@ build obj/third_party/WebKit/Source/core/dom.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/dom.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/generated.ninja b/obj/third_party/WebKit/Source/core/generated.ninja index 5779b99..39ebcdb 100644 --- a/obj/third_party/WebKit/Source/core/generated.ninja +++ b/obj/third_party/WebKit/Source/core/generated.ninja @@ -8,4 +8,5 @@ target_output_name = generated ~ build obj/third_party/WebKit/Source/core/generated.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -119,4 +120,5 @@ build obj/third_party/WebKit/Source/core/generated.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/generated.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/html.ninja b/obj/third_party/WebKit/Source/core/html.ninja index 588993c..0d09151 100644 --- a/obj/third_party/WebKit/Source/core/html.ninja +++ b/obj/third_party/WebKit/Source/core/html.ninja @@ -10,4 +10,5 @@ target_output_name = html ~ build obj/third_party/WebKit/Source/core/html.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -116,4 +117,5 @@ build obj/third_party/WebKit/Source/core/html.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/html.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/prerequisites.ninja b/obj/third_party/WebKit/Source/core/prerequisites.ninja index 701c4fc..ffbe185 100644 --- a/obj/third_party/WebKit/Source/core/prerequisites.ninja +++ b/obj/third_party/WebKit/Source/core/prerequisites.ninja @@ -8,4 +8,5 @@ target_output_name = prerequisites ~ build obj/third_party/WebKit/Source/core/prerequisites.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -114,4 +115,5 @@ build obj/third_party/WebKit/Source/core/prerequisites.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/prerequisites.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/remaining.ninja b/obj/third_party/WebKit/Source/core/remaining.ninja index 437d7ed..3266161 100644 --- a/obj/third_party/WebKit/Source/core/remaining.ninja +++ b/obj/third_party/WebKit/Source/core/remaining.ninja @@ -10,4 +10,5 @@ target_output_name = remaining ~ build obj/third_party/WebKit/Source/core/remaining.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -116,4 +117,5 @@ build obj/third_party/WebKit/Source/core/remaining.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/remaining.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/svg.ninja b/obj/third_party/WebKit/Source/core/svg.ninja index b3470c8..56be4f7 100644 --- a/obj/third_party/WebKit/Source/core/svg.ninja +++ b/obj/third_party/WebKit/Source/core/svg.ninja @@ -10,4 +10,5 @@ target_output_name = svg ~ build obj/third_party/WebKit/Source/core/svg.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -116,4 +117,5 @@ build obj/third_party/WebKit/Source/core/svg.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/svg.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/core/testing.ninja b/obj/third_party/WebKit/Source/core/testing.ninja index a6b4584..ea62ee7 100644 --- a/obj/third_party/WebKit/Source/core/testing.ninja +++ b/obj/third_party/WebKit/Source/core/testing.ninja @@ -10,4 +10,5 @@ target_output_name = testing ~ build obj/third_party/WebKit/Source/core/testing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -121,4 +122,5 @@ build obj/third_party/WebKit/Source/core/testing.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/core/testing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/modules/modules.ninja b/obj/third_party/WebKit/Source/modules/modules.ninja index ccc9f61..f691d10 100644 --- a/obj/third_party/WebKit/Source/modules/modules.ninja +++ b/obj/third_party/WebKit/Source/modules/modules.ninja @@ -10,4 +10,5 @@ target_output_name = modules ~ build obj/third_party/WebKit/Source/modules/modules.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -122,4 +123,5 @@ build obj/third_party/WebKit/Source/modules/modules.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/modules/modules.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/modules/modules_testing.ninja b/obj/third_party/WebKit/Source/modules/modules_testing.ninja index 2c7517a..887d141 100644 --- a/obj/third_party/WebKit/Source/modules/modules_testing.ninja +++ b/obj/third_party/WebKit/Source/modules/modules_testing.ninja @@ -10,4 +10,5 @@ target_output_name = modules_testing ~ build obj/third_party/WebKit/Source/modules/modules_testing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -121,4 +122,5 @@ build obj/third_party/WebKit/Source/modules/modules_testing.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/modules/modules_testing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/platform/blink_common.ninja b/obj/third_party/WebKit/Source/platform/blink_common.ninja index ef2e97f..2053579 100644 --- a/obj/third_party/WebKit/Source/platform/blink_common.ninja +++ b/obj/third_party/WebKit/Source/platform/blink_common.ninja @@ -10,4 +10,5 @@ target_output_name = blink_common ~ build obj/third_party/WebKit/Source/platform/blink_common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/WebKit/Source/platform/blink_common.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/platform/blink_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja index 6fc877d..6f7bc04 100644 --- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja +++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = blink_heap_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests.ninja index 65a7936..a0f78fe 100644 --- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests.ninja +++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = blink_platform_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/third_party/WebKit/Source/platform/blink_x86_sse.ninja b/obj/third_party/WebKit/Source/platform/blink_x86_sse.ninja index d9504d5..f68fe2c 100644 --- a/obj/third_party/WebKit/Source/platform/blink_x86_sse.ninja +++ b/obj/third_party/WebKit/Source/platform/blink_x86_sse.ninja @@ -8,4 +8,5 @@ target_output_name = blink_x86_sse ~ build obj/third_party/WebKit/Source/platform/blink_x86_sse.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -14,4 +15,5 @@ build obj/third_party/WebKit/Source/platform/blink_x86_sse.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/platform/blink_x86_sse.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/WebKit/Source/platform/platform.ninja b/obj/third_party/WebKit/Source/platform/platform.ninja index 9b1ef6e..dd10931 100644 --- a/obj/third_party/WebKit/Source/platform/platform.ninja +++ b/obj/third_party/WebKit/Source/platform/platform.ninja @@ -10,4 +10,5 @@ target_output_name = blink_platform ~ build obj/third_party/WebKit/Source/platform/blink_platform.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -590,4 +591,5 @@ build obj/third_party/WebKit/Source/platform/blink_platform.stamp: ~ build obj/third_party/WebKit/Source/platform/platform.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/WebKit/Source/platform/test_support.ninja b/obj/third_party/WebKit/Source/platform/test_support.ninja index 6b663fe..6344cd2 100644 --- a/obj/third_party/WebKit/Source/platform/test_support.ninja +++ b/obj/third_party/WebKit/Source/platform/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/third_party/WebKit/Source/platform/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -59,4 +60,5 @@ build obj/third_party/WebKit/Source/platform/test_support.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/platform/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/web/test_support.ninja b/obj/third_party/WebKit/Source/web/test_support.ninja index 0c08650..7cc6227 100644 --- a/obj/third_party/WebKit/Source/web/test_support.ninja +++ b/obj/third_party/WebKit/Source/web/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/third_party/WebKit/Source/web/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -121,4 +122,5 @@ build obj/third_party/WebKit/Source/web/test_support.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/web/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/WebKit/Source/web/web.ninja b/obj/third_party/WebKit/Source/web/web.ninja index be5a3e4..39170d2 100644 --- a/obj/third_party/WebKit/Source/web/web.ninja +++ b/obj/third_party/WebKit/Source/web/web.ninja @@ -10,4 +10,5 @@ target_output_name = blink_web ~ build obj/third_party/WebKit/Source/web/blink_web.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -309,4 +310,5 @@ build obj/third_party/WebKit/Source/web/blink_web.stamp: ~ build obj/third_party/WebKit/Source/web/web.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja b/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja index 081469e..8ef66a8 100644 --- a/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja +++ b/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja @@ -9,6 +9,6 @@ target_output_name = webkit_unit_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib imm32.lib -gen/base/allocator/allocator/libcmt.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib ~ output_extension = .exe ~ build ./webkit_unit_tests.exe: ~ diff --git a/obj/third_party/WebKit/Source/wtf/test_support.ninja b/obj/third_party/WebKit/Source/wtf/test_support.ninja index eacd855..5e5358d 100644 --- a/obj/third_party/WebKit/Source/wtf/test_support.ninja +++ b/obj/third_party/WebKit/Source/wtf/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = wtf_test_support ~ build obj/third_party/WebKit/Source/wtf/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,5 @@ build obj/third_party/WebKit/Source/wtf/test_support/WTFTestPrinters.obj: ~ build obj/third_party/WebKit/Source/wtf/wtf_test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/WebKit/Source/wtf/wtf.ninja b/obj/third_party/WebKit/Source/wtf/wtf.ninja index e17c939..16b24d9 100644 --- a/obj/third_party/WebKit/Source/wtf/wtf.ninja +++ b/obj/third_party/WebKit/Source/wtf/wtf.ninja @@ -10,4 +10,5 @@ target_output_name = wtf ~ build obj/third_party/WebKit/Source/wtf/wtf.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/WebKit/Source/wtf/wtf.inputdeps.stamp: ~ build obj/third_party/WebKit/Source/wtf/wtf.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/angle/src/tests/angle_end2end_tests.ninja b/obj/third_party/angle/src/tests/angle_end2end_tests.ninja index d09e829..ccdb9f2 100644 --- a/obj/third_party/angle/src/tests/angle_end2end_tests.ninja +++ b/obj/third_party/angle/src/tests/angle_end2end_tests.ninja @@ -9,11 +9,14 @@ target_output_name = angle_end2end_tests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib dxguid.lib ~ output_extension = .exe ~ build ./angle_end2end_tests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -525,7 +528,9 @@ build ./angle_end2end_tests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/angle/src/tests/angle_end2end_tests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/angle/src/tests/angle_perftests.ninja b/obj/third_party/angle/src/tests/angle_perftests.ninja index be10fa6..deebce8 100644 --- a/obj/third_party/angle/src/tests/angle_perftests.ninja +++ b/obj/third_party/angle/src/tests/angle_perftests.ninja @@ -9,11 +9,14 @@ target_output_name = angle_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib dxguid.lib ~ output_extension = .exe ~ build ./angle_perftests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -481,7 +484,9 @@ build ./angle_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/angle/src/tests/angle_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/angle/src/tests/angle_unittests.ninja b/obj/third_party/angle/src/tests/angle_unittests.ninja index aaab527..24fc6ab 100644 --- a/obj/third_party/angle/src/tests/angle_unittests.ninja +++ b/obj/third_party/angle/src/tests/angle_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = angle_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d3d9.lib dxguid.lib ~ output_extension = .exe ~ build ./angle_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -519,7 +522,9 @@ build ./angle_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/angle/src/tests/angle_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/cacheinvalidation/cacheinvalidation.ninja b/obj/third_party/cacheinvalidation/cacheinvalidation.ninja index 6da4745..9fbc06c 100644 --- a/obj/third_party/cacheinvalidation/cacheinvalidation.ninja +++ b/obj/third_party/cacheinvalidation/cacheinvalidation.ninja @@ -9,8 +9,9 @@ target_output_name = cacheinvalidation ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/cacheinvalidation/cacheinvalidation.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -20,4 +21,6 @@ build obj/third_party/cacheinvalidation/cacheinvalidation.inputdeps.stamp: build obj/third_party/cacheinvalidation/cacheinvalidation.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -47,4 +50,5 @@ build obj/third_party/cacheinvalidation/cacheinvalidation.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/protobuf/protobuf_lite.stamp ~ +| ~ || ~ ~ diff --git a/obj/third_party/cacheinvalidation/cacheinvalidation_unittests.ninja b/obj/third_party/cacheinvalidation/cacheinvalidation_unittests.ninja index a630e72..2d1288d 100644 --- a/obj/third_party/cacheinvalidation/cacheinvalidation_unittests.ninja +++ b/obj/third_party/cacheinvalidation/cacheinvalidation_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = cacheinvalidation_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./cacheinvalidation_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -489,7 +492,9 @@ build ./cacheinvalidation_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/cacheinvalidation/cacheinvalidation_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/crashpad/crashpad/client/client.ninja b/obj/third_party/crashpad/crashpad/client/client.ninja index 8e6beb9..d2b9ad7 100644 --- a/obj/third_party/crashpad/crashpad/client/client.ninja +++ b/obj/third_party/crashpad/crashpad/client/client.ninja @@ -10,4 +10,5 @@ target_output_name = client ~ build obj/third_party/crashpad/crashpad/client/client.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/crashpad/crashpad/client/client.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/client/client.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/crashpad/crashpad/handler/crashpad_handler.ninja b/obj/third_party/crashpad/crashpad/handler/crashpad_handler.ninja index d18bcbc..2e2ec4d 100644 --- a/obj/third_party/crashpad/crashpad/handler/crashpad_handler.ninja +++ b/obj/third_party/crashpad/crashpad/handler/crashpad_handler.ninja @@ -9,9 +9,12 @@ target_output_name = crashpad_handler ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib powrprof.lib rpcrt4.lib cfgmgr32.lib netapi32.lib setupapi.lib winhttp.lib ~ output_extension = .exe ~ build ./crashpad_handler.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -129,7 +132,9 @@ build ./crashpad_handler.exe: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/modp_b64/modp_b64/modp_b64.obj ~ +| ~ || ~ ~ build obj/third_party/crashpad/crashpad/handler/crashpad_handler.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/crashpad/crashpad/handler/handler_lib.ninja b/obj/third_party/crashpad/crashpad/handler/handler_lib.ninja index a4e943d..b964aa7 100644 --- a/obj/third_party/crashpad/crashpad/handler/handler_lib.ninja +++ b/obj/third_party/crashpad/crashpad/handler/handler_lib.ninja @@ -10,4 +10,5 @@ target_output_name = handler_lib ~ build obj/third_party/crashpad/crashpad/handler/handler_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/crashpad/crashpad/handler/handler_lib.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/handler/handler_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/crashpad/crashpad/minidump/minidump.ninja b/obj/third_party/crashpad/crashpad/minidump/minidump.ninja index 41f3b97..3955e8d 100644 --- a/obj/third_party/crashpad/crashpad/minidump/minidump.ninja +++ b/obj/third_party/crashpad/crashpad/minidump/minidump.ninja @@ -10,4 +10,5 @@ target_output_name = minidump ~ build obj/third_party/crashpad/crashpad/minidump/minidump.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/crashpad/crashpad/minidump/minidump.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/minidump/minidump.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/crashpad/crashpad/snapshot/snapshot.ninja b/obj/third_party/crashpad/crashpad/snapshot/snapshot.ninja index b24eb77..a1fec31 100644 --- a/obj/third_party/crashpad/crashpad/snapshot/snapshot.ninja +++ b/obj/third_party/crashpad/crashpad/snapshot/snapshot.ninja @@ -10,4 +10,5 @@ target_output_name = snapshot ~ build obj/third_party/crashpad/crashpad/snapshot/snapshot.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/crashpad/crashpad/snapshot/snapshot.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/snapshot/snapshot.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/crashpad/crashpad/tools/tool_support.ninja b/obj/third_party/crashpad/crashpad/tools/tool_support.ninja index cf22430..90efb32 100644 --- a/obj/third_party/crashpad/crashpad/tools/tool_support.ninja +++ b/obj/third_party/crashpad/crashpad/tools/tool_support.ninja @@ -10,4 +10,5 @@ target_output_name = tool_support ~ build obj/third_party/crashpad/crashpad/tools/tool_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/crashpad/crashpad/tools/tool_support.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/tools/tool_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/crashpad/crashpad/util/util.ninja b/obj/third_party/crashpad/crashpad/util/util.ninja index 9aa6047..1ad4a90 100644 --- a/obj/third_party/crashpad/crashpad/util/util.ninja +++ b/obj/third_party/crashpad/crashpad/util/util.ninja @@ -11,4 +11,5 @@ target_output_name = util ~ build obj/third_party/crashpad/crashpad/util/util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/crashpad/crashpad/util/util.inputdeps.stamp: ~ build obj/third_party/crashpad/crashpad/util/util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/fips181/fips181.ninja b/obj/third_party/fips181/fips181.ninja index c64977e..3d990cb 100644 --- a/obj/third_party/fips181/fips181.ninja +++ b/obj/third_party/fips181/fips181.ninja @@ -10,4 +10,5 @@ target_output_name = fips181 ~ build obj/third_party/fips181/fips181.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/fips181/fips181.inputdeps.stamp: ~ build obj/third_party/fips181/fips181.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/hunspell/hunspell.ninja b/obj/third_party/hunspell/hunspell.ninja index 72e2c2b..bc71983 100644 --- a/obj/third_party/hunspell/hunspell.ninja +++ b/obj/third_party/hunspell/hunspell.ninja @@ -10,4 +10,5 @@ target_output_name = hunspell ~ build obj/third_party/hunspell/hunspell.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/hunspell/hunspell.inputdeps.stamp: ~ build obj/third_party/hunspell/hunspell.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/leveldatabase/env_chromium_unittests.ninja b/obj/third_party/leveldatabase/env_chromium_unittests.ninja index b6ca40a..d1eb135 100644 --- a/obj/third_party/leveldatabase/env_chromium_unittests.ninja +++ b/obj/third_party/leveldatabase/env_chromium_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = env_chromium_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./env_chromium_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -461,7 +464,9 @@ build ./env_chromium_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/env_chromium_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldatabase.ninja b/obj/third_party/leveldatabase/leveldatabase.ninja index 7045019..d336b98 100644 --- a/obj/third_party/leveldatabase/leveldatabase.ninja +++ b/obj/third_party/leveldatabase/leveldatabase.ninja @@ -9,8 +9,9 @@ target_output_name = leveldatabase ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/leveldatabase/leveldatabase.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/third_party/leveldatabase/leveldatabase.inputdeps.stamp: build obj/third_party/leveldatabase/leveldatabase.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -64,4 +67,5 @@ build obj/third_party/leveldatabase/leveldatabase.lib: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ diff --git a/obj/third_party/leveldatabase/leveldb_arena_test.ninja b/obj/third_party/leveldatabase/leveldb_arena_test.ninja index 1defa5c..d65a4b1 100644 --- a/obj/third_party/leveldatabase/leveldb_arena_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_arena_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_arena_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_arena_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_arena_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_arena_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_bloom_test.ninja b/obj/third_party/leveldatabase/leveldb_bloom_test.ninja index 1dd9291..6c13bee 100644 --- a/obj/third_party/leveldatabase/leveldb_bloom_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_bloom_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_bloom_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_bloom_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_bloom_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_bloom_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_cache_test.ninja b/obj/third_party/leveldatabase/leveldb_cache_test.ninja index 865a4b0..f8c367d 100644 --- a/obj/third_party/leveldatabase/leveldb_cache_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_cache_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_cache_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_cache_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_cache_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_cache_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_corruption_test.ninja b/obj/third_party/leveldatabase/leveldb_corruption_test.ninja index b1305e8..fb6b7e9 100644 --- a/obj/third_party/leveldatabase/leveldb_corruption_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_corruption_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_corruption_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_corruption_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_corruption_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_corruption_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_crc32c_test.ninja b/obj/third_party/leveldatabase/leveldb_crc32c_test.ninja index 47e1d34..57213f7 100644 --- a/obj/third_party/leveldatabase/leveldb_crc32c_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_crc32c_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_crc32c_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_crc32c_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_crc32c_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_crc32c_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_db_bench.ninja b/obj/third_party/leveldatabase/leveldb_db_bench.ninja index ed89a3f..11495f6 100644 --- a/obj/third_party/leveldatabase/leveldb_db_bench.ninja +++ b/obj/third_party/leveldatabase/leveldb_db_bench.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_db_bench ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_db_bench.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_db_bench.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_db_bench.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_db_test.ninja b/obj/third_party/leveldatabase/leveldb_db_test.ninja index 1f97ff5..1be7e76 100644 --- a/obj/third_party/leveldatabase/leveldb_db_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_db_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_db_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_db_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_db_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_db_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_dbformat_test.ninja b/obj/third_party/leveldatabase/leveldb_dbformat_test.ninja index 68fe0b2..71ae43e 100644 --- a/obj/third_party/leveldatabase/leveldb_dbformat_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_dbformat_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_dbformat_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_dbformat_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_dbformat_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_dbformat_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_env_test.ninja b/obj/third_party/leveldatabase/leveldb_env_test.ninja index cdb2013..601a297 100644 --- a/obj/third_party/leveldatabase/leveldb_env_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_env_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_env_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_env_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_env_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_env_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_filename_test.ninja b/obj/third_party/leveldatabase/leveldb_filename_test.ninja index 2890384..d445e68 100644 --- a/obj/third_party/leveldatabase/leveldb_filename_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_filename_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_filename_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_filename_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_filename_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_filename_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_filter_block_test.ninja b/obj/third_party/leveldatabase/leveldb_filter_block_test.ninja index 405f4ea..8aeb1b1 100644 --- a/obj/third_party/leveldatabase/leveldb_filter_block_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_filter_block_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_filter_block_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_filter_block_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_filter_block_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_filter_block_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_log_test.ninja b/obj/third_party/leveldatabase/leveldb_log_test.ninja index ca2ff21..ac5901c 100644 --- a/obj/third_party/leveldatabase/leveldb_log_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_log_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_log_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_log_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_log_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_log_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_skiplist_test.ninja b/obj/third_party/leveldatabase/leveldb_skiplist_test.ninja index 2038c2d..c7d0690 100644 --- a/obj/third_party/leveldatabase/leveldb_skiplist_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_skiplist_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_skiplist_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_skiplist_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_skiplist_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_skiplist_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_table_test.ninja b/obj/third_party/leveldatabase/leveldb_table_test.ninja index 7c697bf..7883d1c 100644 --- a/obj/third_party/leveldatabase/leveldb_table_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_table_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_table_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_table_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_table_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_table_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_testutil.ninja b/obj/third_party/leveldatabase/leveldb_testutil.ninja index d4fa0c9..a54142d 100644 --- a/obj/third_party/leveldatabase/leveldb_testutil.ninja +++ b/obj/third_party/leveldatabase/leveldb_testutil.ninja @@ -9,8 +9,9 @@ target_output_name = leveldb_testutil ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/leveldatabase/leveldb_testutil.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/third_party/leveldatabase/leveldb_testutil.inputdeps.stamp: build obj/third_party/leveldatabase/leveldb_testutil.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -30,4 +33,5 @@ build obj/third_party/leveldatabase/leveldb_testutil.lib: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ diff --git a/obj/third_party/leveldatabase/leveldb_version_edit_test.ninja b/obj/third_party/leveldatabase/leveldb_version_edit_test.ninja index c0f71aa..f0fe75c 100644 --- a/obj/third_party/leveldatabase/leveldb_version_edit_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_version_edit_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_version_edit_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_version_edit_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_version_edit_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_version_edit_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/leveldatabase/leveldb_write_batch_test.ninja b/obj/third_party/leveldatabase/leveldb_write_batch_test.ninja index abd617c..ef9e6a6 100644 --- a/obj/third_party/leveldatabase/leveldb_write_batch_test.ninja +++ b/obj/third_party/leveldatabase/leveldb_write_batch_test.ninja @@ -9,9 +9,12 @@ target_output_name = leveldb_write_batch_test ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./leveldb_write_batch_test.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -28,7 +31,9 @@ build ./leveldb_write_batch_test.exe: obj/third_party/re2/re2.lib ~ obj/third_party/snappy/snappy.lib ~ +| ~ || ~ ~ build obj/third_party/leveldatabase/leveldb_write_batch_test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/libaddressinput/libaddressinput.ninja b/obj/third_party/libaddressinput/libaddressinput.ninja index 8d3c7aa..310ac71 100644 --- a/obj/third_party/libaddressinput/libaddressinput.ninja +++ b/obj/third_party/libaddressinput/libaddressinput.ninja @@ -9,8 +9,9 @@ target_output_name = libaddressinput ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/libaddressinput/libaddressinput.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,6 @@ build obj/third_party/libaddressinput/libaddressinput.inputdeps.stamp: build obj/third_party/libaddressinput/libaddressinput.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -58,4 +61,5 @@ build obj/third_party/libaddressinput/libaddressinput.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/re2/re2.lib ~ +| ~ || ~ ~ diff --git a/obj/third_party/libaddressinput/libaddressinput_unittests.ninja b/obj/third_party/libaddressinput/libaddressinput_unittests.ninja index e2239fc..58965df 100644 --- a/obj/third_party/libaddressinput/libaddressinput_unittests.ninja +++ b/obj/third_party/libaddressinput/libaddressinput_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = libaddressinput_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./libaddressinput_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1928,7 +1931,9 @@ build ./libaddressinput_unittests.exe: obj/v8/v8_libbase/sys-info.obj ~ obj/v8/v8_libbase/time.obj ~ +| ~ || ~ ~ build obj/third_party/libaddressinput/libaddressinput_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/libaddressinput/util.ninja b/obj/third_party/libaddressinput/util.ninja index eb79813..b2ec5c2 100644 --- a/obj/third_party/libaddressinput/util.ninja +++ b/obj/third_party/libaddressinput/util.ninja @@ -9,8 +9,9 @@ target_output_name = util ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/libaddressinput/util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -22,4 +23,6 @@ build obj/third_party/libaddressinput/util.inputdeps.stamp: build obj/third_party/libaddressinput/util.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -50,4 +53,5 @@ build obj/third_party/libaddressinput/util.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/third_party/re2/re2.lib ~ +| ~ || ~ ~ diff --git a/obj/third_party/libjingle/libjingle.ninja b/obj/third_party/libjingle/libjingle.ninja index 4632c4f..833b637 100644 --- a/obj/third_party/libjingle/libjingle.ninja +++ b/obj/third_party/libjingle/libjingle.ninja @@ -9,8 +9,9 @@ target_output_name = libjingle ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib crypt32.lib iphlpapi.lib secur32.lib ~ output_extension = .lib ~ build obj/third_party/libjingle/libjingle.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/third_party/libjingle/libjingle.inputdeps.stamp: build obj/third_party/libjingle/libjingle.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -108,4 +111,5 @@ build obj/third_party/libjingle/libjingle.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/third_party/libjingle/libjingle_p2p_constants.ninja b/obj/third_party/libjingle/libjingle_p2p_constants.ninja index 09d29f9..cbf2269 100644 --- a/obj/third_party/libjingle/libjingle_p2p_constants.ninja +++ b/obj/third_party/libjingle/libjingle_p2p_constants.ninja @@ -9,8 +9,9 @@ target_output_name = libjingle_p2p_constants ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/libjingle/libjingle_p2p_constants.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,6 @@ build obj/third_party/libjingle/libjingle_p2p_constants.inputdeps.stamp: build obj/third_party/libjingle/libjingle_p2p_constants.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -62,4 +65,5 @@ build obj/third_party/libjingle/libjingle_p2p_constants.lib: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/third_party/libjingle/libjingle_webrtc.ninja b/obj/third_party/libjingle/libjingle_webrtc.ninja index 9a41e50..ef14252 100644 --- a/obj/third_party/libjingle/libjingle_webrtc.ninja +++ b/obj/third_party/libjingle/libjingle_webrtc.ninja @@ -10,4 +10,5 @@ target_output_name = libjingle_webrtc ~ build obj/third_party/libjingle/libjingle_webrtc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/third_party/libjingle/libjingle_webrtc.inputdeps.stamp: ~ build obj/third_party/libjingle/libjingle_webrtc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/libjingle/libjingle_webrtc_common.ninja b/obj/third_party/libjingle/libjingle_webrtc_common.ninja index 5cc3d28..db140ac 100644 --- a/obj/third_party/libjingle/libjingle_webrtc_common.ninja +++ b/obj/third_party/libjingle/libjingle_webrtc_common.ninja @@ -10,4 +10,5 @@ target_output_name = libjingle_webrtc_common ~ build obj/third_party/libjingle/libjingle_webrtc_common.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/third_party/libjingle/libjingle_webrtc_common.inputdeps.stamp: ~ build obj/third_party/libjingle/libjingle_webrtc_common.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/libjingle/libpeerconnection.ninja b/obj/third_party/libjingle/libpeerconnection.ninja index 1d6e22d..300224b 100644 --- a/obj/third_party/libjingle/libpeerconnection.ninja +++ b/obj/third_party/libjingle/libpeerconnection.ninja @@ -10,4 +10,5 @@ target_output_name = libpeerconnection ~ build obj/third_party/libjingle/libpeerconnection.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -38,4 +39,5 @@ build obj/third_party/libjingle/libpeerconnection.inputdeps.stamp: ~ build obj/third_party/libjingle/libpeerconnection.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/libjingle/libstunprober.ninja b/obj/third_party/libjingle/libstunprober.ninja index 9c779b0..1ea9758 100644 --- a/obj/third_party/libjingle/libstunprober.ninja +++ b/obj/third_party/libjingle/libstunprober.ninja @@ -10,4 +10,5 @@ target_output_name = libstunprober ~ build obj/third_party/libjingle/libstunprober.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/third_party/libjingle/libstunprober.inputdeps.stamp: ~ build obj/third_party/libjingle/libstunprober.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/libphonenumber/libphonenumber_unittests.ninja b/obj/third_party/libphonenumber/libphonenumber_unittests.ninja index 0a7aead..c98faa6 100644 --- a/obj/third_party/libphonenumber/libphonenumber_unittests.ninja +++ b/obj/third_party/libphonenumber/libphonenumber_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = libphonenumber_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./libphonenumber_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -487,7 +490,9 @@ build ./libphonenumber_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/libphonenumber/libphonenumber_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/embedder/embedder.ninja b/obj/third_party/mojo/src/mojo/edk/embedder/embedder.ninja index 830cff8..bc06c89 100644 --- a/obj/third_party/mojo/src/mojo/edk/embedder/embedder.ninja +++ b/obj/third_party/mojo/src/mojo/edk/embedder/embedder.ninja @@ -10,4 +10,5 @@ target_output_name = embedder ~ build obj/third_party/mojo/src/mojo/edk/embedder/embedder.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/mojo/src/mojo/edk/embedder/embedder.inputdeps.stamp: ~ build obj/third_party/mojo/src/mojo/edk/embedder/embedder.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.ninja index b8e29f6..d76133c 100644 --- a/obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.ninja @@ -10,4 +10,5 @@ target_output_name = embedder_unittests ~ build obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.inputdeps.st ~ build obj/third_party/mojo/src/mojo/edk/embedder/embedder_unittests.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/embedder/platform.ninja b/obj/third_party/mojo/src/mojo/edk/embedder/platform.ninja index 95cb500..57c0c48 100644 --- a/obj/third_party/mojo/src/mojo/edk/embedder/platform.ninja +++ b/obj/third_party/mojo/src/mojo/edk/embedder/platform.ninja @@ -10,4 +10,5 @@ target_output_name = platform ~ build obj/third_party/mojo/src/mojo/edk/embedder/platform.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/mojo/src/mojo/edk/embedder/platform.inputdeps.stamp: ~ build obj/third_party/mojo/src/mojo/edk/embedder/platform.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/mojo/src/mojo/edk/js/js.ninja b/obj/third_party/mojo/src/mojo/edk/js/js.ninja index 12e359b..d080500 100644 --- a/obj/third_party/mojo/src/mojo/edk/js/js.ninja +++ b/obj/third_party/mojo/src/mojo/edk/js/js.ninja @@ -10,4 +10,5 @@ target_output_name = js ~ build obj/third_party/mojo/src/mojo/edk/js/js.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/third_party/mojo/src/mojo/edk/js/js.inputdeps.stamp: ~ build obj/third_party/mojo/src/mojo/edk/js/js.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/mojo/src/mojo/edk/system/mojo_message_pipe_perftests.ninja b/obj/third_party/mojo/src/mojo/edk/system/mojo_message_pipe_perftests.ninja index b4c5ae1..d86edec 100644 --- a/obj/third_party/mojo/src/mojo/edk/system/mojo_message_pipe_perftests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/system/mojo_message_pipe_perftests.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_message_pipe_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_message_pipe_perftests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -554,7 +557,9 @@ build ./mojo_message_pipe_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/system/mojo_message_pipe_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/system/mojo_system_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/system/mojo_system_unittests.ninja index 992f0ca..0540393 100644 --- a/obj/third_party/mojo/src/mojo/edk/system/mojo_system_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/system/mojo_system_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = mojo_system_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_system_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -590,7 +593,9 @@ build ./mojo_system_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/system/mojo_system_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/system/system.ninja b/obj/third_party/mojo/src/mojo/edk/system/system.ninja index 4bfe234..357e0ef 100644 --- a/obj/third_party/mojo/src/mojo/edk/system/system.ninja +++ b/obj/third_party/mojo/src/mojo/edk/system/system.ninja @@ -10,4 +10,5 @@ target_output_name = mojo_system_impl ~ build obj/third_party/mojo/src/mojo/edk/system/mojo_system_impl.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -72,4 +73,5 @@ build obj/third_party/mojo/src/mojo/edk/system/mojo_system_impl.stamp: ~ build obj/third_party/mojo/src/mojo/edk/system/system.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/system/test_utils.ninja b/obj/third_party/mojo/src/mojo/edk/system/test_utils.ninja index c77324b..4b1229d 100644 --- a/obj/third_party/mojo/src/mojo/edk/system/test_utils.ninja +++ b/obj/third_party/mojo/src/mojo/edk/system/test_utils.ninja @@ -10,4 +10,5 @@ target_output_name = test_utils ~ build obj/third_party/mojo/src/mojo/edk/system/test_utils.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/mojo/src/mojo/edk/system/test_utils.inputdeps.stamp: ~ build obj/third_party/mojo/src/mojo/edk/system/test_utils.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_perftests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_perftests.ninja index 7174550..5095ee7 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_perftests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_perftests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_bindings_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_bindings_perftests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -599,7 +602,9 @@ build ./mojo_public_bindings_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_unittests.ninja index 83647ee..42bc64d 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_unittests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_bindings_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_bindings_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -679,7 +682,9 @@ build ./mojo_public_bindings_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_bindings_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_environment_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_environment_unittests.ninja index 378713c..f0447f7 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_environment_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_environment_unittests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_environment_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_environment_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -555,7 +558,9 @@ build ./mojo_public_environment_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_environment_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_perftests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_perftests.ninja index 8ac450e..bf6e78f 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_perftests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_perftests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_system_perftests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_system_perftests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -552,7 +555,9 @@ build ./mojo_public_system_perftests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_unittests.ninja index 091eeef..e7180cd 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_unittests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_system_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_system_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -557,7 +560,9 @@ build ./mojo_public_system_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_system_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_utility_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_utility_unittests.ninja index 454102d..1c314bb 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/mojo_public_utility_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/mojo_public_utility_unittests.ninja @@ -7,10 +7,13 @@ target_output_name = mojo_public_utility_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./mojo_public_utility_unittests.exe: ~ ./mojo_test_support.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -552,7 +555,9 @@ build ./mojo_public_utility_unittests.exe: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ build obj/third_party/mojo/src/mojo/edk/test/mojo_public_utility_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.ninja b/obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.ninja index 8e09d71..5a23332 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.ninja @@ -10,4 +10,5 @@ target_output_name = run_all_perftests ~ build obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.inputdeps.stamp: build obj/third_party/mojo/src/mojo/edk/test/run_all_perftests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.ninja b/obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.ninja index d032396..5d8706d 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.ninja @@ -10,4 +10,5 @@ target_output_name = run_all_unittests ~ build obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.inputdeps.stamp: build obj/third_party/mojo/src/mojo/edk/test/run_all_unittests.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/test_support.ninja b/obj/third_party/mojo/src/mojo/edk/test/test_support.ninja index c9400f4..ee7caf3 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/test_support.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/third_party/mojo/src/mojo/edk/test/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/mojo/src/mojo/edk/test/test_support.inputdeps.stamp: ~ build obj/third_party/mojo/src/mojo/edk/test/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/mojo/src/mojo/edk/test/test_support_impl.ninja b/obj/third_party/mojo/src/mojo/edk/test/test_support_impl.ninja index da4d94a..2ce461d 100644 --- a/obj/third_party/mojo/src/mojo/edk/test/test_support_impl.ninja +++ b/obj/third_party/mojo/src/mojo/edk/test/test_support_impl.ninja @@ -10,4 +10,5 @@ target_output_name = test_support_impl ~ build obj/third_party/mojo/src/mojo/edk/test/test_support_impl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/mojo/src/mojo/edk/test/test_support_impl.inputdeps.stamp: build obj/third_party/mojo/src/mojo/edk/test/test_support_impl.stamp: ~ ./mojo_test_support.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/third_party/webrtc/audio/audio.ninja b/obj/third_party/webrtc/audio/audio.ninja index 837ce73..1703c15 100644 --- a/obj/third_party/webrtc/audio/audio.ninja +++ b/obj/third_party/webrtc/audio/audio.ninja @@ -10,4 +10,5 @@ target_output_name = audio ~ build obj/third_party/webrtc/audio/audio.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/webrtc/audio/audio.inputdeps.stamp: ~ build obj/third_party/webrtc/audio/audio.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/base/rtc_base.ninja b/obj/third_party/webrtc/base/rtc_base.ninja index 852e5b4..26e708c 100644 --- a/obj/third_party/webrtc/base/rtc_base.ninja +++ b/obj/third_party/webrtc/base/rtc_base.ninja @@ -9,8 +9,9 @@ target_output_name = rtc_base ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = crypt32.lib iphlpapi.lib secur32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/webrtc/base/rtc_base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -32,4 +33,6 @@ build obj/third_party/webrtc/base/rtc_base.inputdeps.stamp: build obj/third_party/webrtc/base/rtc_base.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -112,4 +115,5 @@ build obj/third_party/webrtc/base/rtc_base.lib: obj/third_party/webrtc/base/rtc_base_approved.lib ~ obj/third_party/webrtc/webrtc_common.stamp ~ +| ~ || ~ ~ diff --git a/obj/third_party/webrtc/base/rtc_base_approved.ninja b/obj/third_party/webrtc/base/rtc_base_approved.ninja index f274e8c..849d850 100644 --- a/obj/third_party/webrtc/base/rtc_base_approved.ninja +++ b/obj/third_party/webrtc/base/rtc_base_approved.ninja @@ -9,8 +9,9 @@ target_output_name = rtc_base_approved ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/webrtc/base/rtc_base_approved.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/third_party/webrtc/base/rtc_base_approved.inputdeps.stamp: build obj/third_party/webrtc/base/rtc_base_approved.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -44,4 +47,5 @@ build obj/third_party/webrtc/base/rtc_base_approved.lib: obj/third_party/webrtc/base/rtc_base_approved/thread_checker_impl.obj ~ obj/third_party/webrtc/base/rtc_base_approved/timeutils.obj ~ +| ~ || ~ ~ diff --git a/obj/third_party/webrtc/call/call.ninja b/obj/third_party/webrtc/call/call.ninja index 663af74..45e2750 100644 --- a/obj/third_party/webrtc/call/call.ninja +++ b/obj/third_party/webrtc/call/call.ninja @@ -10,4 +10,5 @@ target_output_name = call ~ build obj/third_party/webrtc/call/call.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/call/call.inputdeps.stamp: ~ build obj/third_party/webrtc/call/call.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/common_audio/common_audio.ninja b/obj/third_party/webrtc/common_audio/common_audio.ninja index 57f04aa..4add283 100644 --- a/obj/third_party/webrtc/common_audio/common_audio.ninja +++ b/obj/third_party/webrtc/common_audio/common_audio.ninja @@ -11,4 +11,5 @@ target_output_name = common_audio ~ build obj/third_party/webrtc/common_audio/common_audio.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/common_audio/common_audio.inputdeps.stamp: ~ build obj/third_party/webrtc/common_audio/common_audio.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/common_video/common_video.ninja b/obj/third_party/webrtc/common_video/common_video.ninja index 342ce24..0311278 100644 --- a/obj/third_party/webrtc/common_video/common_video.ninja +++ b/obj/third_party/webrtc/common_video/common_video.ninja @@ -10,4 +10,5 @@ target_output_name = common_video ~ build obj/third_party/webrtc/common_video/common_video.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/third_party/webrtc/common_video/common_video.inputdeps.stamp: ~ build obj/third_party/webrtc/common_video/common_video.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/audio_coding.ninja b/obj/third_party/webrtc/modules/audio_coding/audio_coding.ninja index ca906d5..9db146d 100644 --- a/obj/third_party/webrtc/modules/audio_coding/audio_coding.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/audio_coding.ninja @@ -10,4 +10,5 @@ target_output_name = audio_coding ~ build obj/third_party/webrtc/modules/audio_coding/audio_coding.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/audio_coding.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/audio_coding.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/cng.ninja b/obj/third_party/webrtc/modules/audio_coding/cng.ninja index f9475ac..3c492a9 100644 --- a/obj/third_party/webrtc/modules/audio_coding/cng.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/cng.ninja @@ -11,4 +11,5 @@ target_output_name = cng ~ build obj/third_party/webrtc/modules/audio_coding/cng.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/cng.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/cng.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/ilbc.ninja b/obj/third_party/webrtc/modules/audio_coding/ilbc.ninja index 5ddf371..22ef241 100644 --- a/obj/third_party/webrtc/modules/audio_coding/ilbc.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/ilbc.ninja @@ -11,4 +11,5 @@ target_output_name = ilbc ~ build obj/third_party/webrtc/modules/audio_coding/ilbc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/ilbc.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/ilbc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/isac.ninja b/obj/third_party/webrtc/modules/audio_coding/isac.ninja index 69bb591..02fab6a 100644 --- a/obj/third_party/webrtc/modules/audio_coding/isac.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/isac.ninja @@ -11,4 +11,5 @@ target_output_name = isac ~ build obj/third_party/webrtc/modules/audio_coding/isac.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/isac.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/isac.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/isac_fix.ninja b/obj/third_party/webrtc/modules/audio_coding/isac_fix.ninja index 11a552a..7a96efa 100644 --- a/obj/third_party/webrtc/modules/audio_coding/isac_fix.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/isac_fix.ninja @@ -11,4 +11,5 @@ target_output_name = isac_fix ~ build obj/third_party/webrtc/modules/audio_coding/isac_fix.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/isac_fix.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/isac_fix.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/neteq.ninja b/obj/third_party/webrtc/modules/audio_coding/neteq.ninja index c8fd82f..e302fc5 100644 --- a/obj/third_party/webrtc/modules/audio_coding/neteq.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/neteq.ninja @@ -10,4 +10,5 @@ target_output_name = neteq ~ build obj/third_party/webrtc/modules/audio_coding/neteq.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/audio_coding/neteq.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/neteq.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/red.ninja b/obj/third_party/webrtc/modules/audio_coding/red.ninja index e0a8a4b..5db4216 100644 --- a/obj/third_party/webrtc/modules/audio_coding/red.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/red.ninja @@ -10,4 +10,5 @@ target_output_name = red ~ build obj/third_party/webrtc/modules/audio_coding/red.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/audio_coding/red.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/red.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_coding/webrtc_opus.ninja b/obj/third_party/webrtc/modules/audio_coding/webrtc_opus.ninja index 36fe791..02ef57b 100644 --- a/obj/third_party/webrtc/modules/audio_coding/webrtc_opus.ninja +++ b/obj/third_party/webrtc/modules/audio_coding/webrtc_opus.ninja @@ -11,4 +11,5 @@ target_output_name = webrtc_opus ~ build obj/third_party/webrtc/modules/audio_coding/webrtc_opus.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_coding/webrtc_opus.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_coding/webrtc_opus.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.ninja b/obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.ninja index e15cd13..35ad827 100644 --- a/obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.ninja +++ b/obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.ninja @@ -10,4 +10,5 @@ target_output_name = audio_conference_mixer ~ build obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mix ~ build obj/third_party/webrtc/modules/audio_conference_mixer/audio_conference_mixer.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_device/audio_device.ninja b/obj/third_party/webrtc/modules/audio_device/audio_device.ninja index 1d6fa32..42d8919 100644 --- a/obj/third_party/webrtc/modules/audio_device/audio_device.ninja +++ b/obj/third_party/webrtc/modules/audio_device/audio_device.ninja @@ -10,4 +10,5 @@ target_output_name = audio_device ~ build obj/third_party/webrtc/modules/audio_device/audio_device.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/audio_device/audio_device.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/audio_device/audio_device.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/audio_processing/audio_processing.ninja b/obj/third_party/webrtc/modules/audio_processing/audio_processing.ninja index 02b031e..3a7ae49 100644 --- a/obj/third_party/webrtc/modules/audio_processing/audio_processing.ninja +++ b/obj/third_party/webrtc/modules/audio_processing/audio_processing.ninja @@ -11,4 +11,5 @@ target_output_name = audio_processing ~ build obj/third_party/webrtc/modules/audio_processing/audio_processing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/webrtc/modules/audio_processing/audio_processing.inputdeps ~ build obj/third_party/webrtc/modules/audio_processing/audio_processing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.ninja b/obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.ninja index 167721f..a7ae828 100644 --- a/obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.ninja +++ b/obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.ninja @@ -10,4 +10,5 @@ target_output_name = bitrate_controller ~ build obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.input ~ build obj/third_party/webrtc/modules/bitrate_controller/bitrate_controller.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/desktop_capture/desktop_capture.ninja b/obj/third_party/webrtc/modules/desktop_capture/desktop_capture.ninja index 3e3eeb8..cbbce3e 100644 --- a/obj/third_party/webrtc/modules/desktop_capture/desktop_capture.ninja +++ b/obj/third_party/webrtc/modules/desktop_capture/desktop_capture.ninja @@ -10,4 +10,5 @@ target_output_name = desktop_capture ~ build obj/third_party/webrtc/modules/desktop_capture/desktop_capture.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/desktop_capture/desktop_capture.inputdeps.s ~ build obj/third_party/webrtc/modules/desktop_capture/desktop_capture.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/media_file/media_file.ninja b/obj/third_party/webrtc/modules/media_file/media_file.ninja index cc3bbfb..0af00e3 100644 --- a/obj/third_party/webrtc/modules/media_file/media_file.ninja +++ b/obj/third_party/webrtc/modules/media_file/media_file.ninja @@ -10,4 +10,5 @@ target_output_name = media_file ~ build obj/third_party/webrtc/modules/media_file/media_file.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/media_file/media_file.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/media_file/media_file.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/pacing/pacing.ninja b/obj/third_party/webrtc/modules/pacing/pacing.ninja index c4aefc2..cf30706 100644 --- a/obj/third_party/webrtc/modules/pacing/pacing.ninja +++ b/obj/third_party/webrtc/modules/pacing/pacing.ninja @@ -10,4 +10,5 @@ target_output_name = pacing ~ build obj/third_party/webrtc/modules/pacing/pacing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/pacing/pacing.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/pacing/pacing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.ninja b/obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.ninja index c339172..247bcba 100644 --- a/obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.ninja +++ b/obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.ninja @@ -10,4 +10,5 @@ target_output_name = remote_bitrate_estimator ~ build obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_est ~ build obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.ninja b/obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.ninja index 7687ba0..0bb31fa 100644 --- a/obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.ninja +++ b/obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.ninja @@ -10,4 +10,5 @@ target_output_name = rtp_rtcp ~ build obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/rtp_rtcp/rtp_rtcp.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/utility/utility.ninja b/obj/third_party/webrtc/modules/utility/utility.ninja index 406d3b8..3a7a091 100644 --- a/obj/third_party/webrtc/modules/utility/utility.ninja +++ b/obj/third_party/webrtc/modules/utility/utility.ninja @@ -10,4 +10,5 @@ target_output_name = utility ~ build obj/third_party/webrtc/modules/utility/utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/third_party/webrtc/modules/utility/utility.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/utility/utility.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_capture/video_capture.ninja b/obj/third_party/webrtc/modules/video_capture/video_capture.ninja index 032a0c8..bf6285a 100644 --- a/obj/third_party/webrtc/modules/video_capture/video_capture.ninja +++ b/obj/third_party/webrtc/modules/video_capture/video_capture.ninja @@ -10,4 +10,5 @@ target_output_name = video_capture ~ build obj/third_party/webrtc/modules/video_capture/video_capture.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_capture/video_capture.inputdeps.stamp ~ build obj/third_party/webrtc/modules/video_capture/video_capture.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_capture/video_capture_module.ninja b/obj/third_party/webrtc/modules/video_capture/video_capture_module.ninja index efa150e..1b9ea64 100644 --- a/obj/third_party/webrtc/modules/video_capture/video_capture_module.ninja +++ b/obj/third_party/webrtc/modules/video_capture/video_capture_module.ninja @@ -10,4 +10,5 @@ target_output_name = video_capture_module ~ build obj/third_party/webrtc/modules/video_capture/video_capture_module.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_capture/video_capture_module.inputdep ~ build obj/third_party/webrtc/modules/video_capture/video_capture_module.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/video_coding.ninja b/obj/third_party/webrtc/modules/video_coding/video_coding.ninja index d259c1f..d819451 100644 --- a/obj/third_party/webrtc/modules/video_coding/video_coding.ninja +++ b/obj/third_party/webrtc/modules/video_coding/video_coding.ninja @@ -10,4 +10,5 @@ target_output_name = video_coding ~ build obj/third_party/webrtc/modules/video_coding/video_coding.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_coding/video_coding.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_coding/video_coding.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/video_coding_utility.ninja b/obj/third_party/webrtc/modules/video_coding/video_coding_utility.ninja index df92d44..d2f9c51 100644 --- a/obj/third_party/webrtc/modules/video_coding/video_coding_utility.ninja +++ b/obj/third_party/webrtc/modules/video_coding/video_coding_utility.ninja @@ -10,4 +10,5 @@ target_output_name = video_coding_utility ~ build obj/third_party/webrtc/modules/video_coding/video_coding_utility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/video_coding/video_coding_utility.inputdeps ~ build obj/third_party/webrtc/modules/video_coding/video_coding_utility.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/webrtc_h264.ninja b/obj/third_party/webrtc/modules/video_coding/webrtc_h264.ninja index 59f5447..610d424 100644 --- a/obj/third_party/webrtc/modules/video_coding/webrtc_h264.ninja +++ b/obj/third_party/webrtc/modules/video_coding/webrtc_h264.ninja @@ -10,4 +10,5 @@ target_output_name = webrtc_h264 ~ build obj/third_party/webrtc/modules/video_coding/webrtc_h264.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/video_coding/webrtc_h264.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_coding/webrtc_h264.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/webrtc_i420.ninja b/obj/third_party/webrtc/modules/video_coding/webrtc_i420.ninja index 5a25d36..46a853f 100644 --- a/obj/third_party/webrtc/modules/video_coding/webrtc_i420.ninja +++ b/obj/third_party/webrtc/modules/video_coding/webrtc_i420.ninja @@ -10,4 +10,5 @@ target_output_name = webrtc_i420 ~ build obj/third_party/webrtc/modules/video_coding/webrtc_i420.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/third_party/webrtc/modules/video_coding/webrtc_i420.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_coding/webrtc_i420.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/webrtc_vp8.ninja b/obj/third_party/webrtc/modules/video_coding/webrtc_vp8.ninja index 480a8ab..10e5fe3 100644 --- a/obj/third_party/webrtc/modules/video_coding/webrtc_vp8.ninja +++ b/obj/third_party/webrtc/modules/video_coding/webrtc_vp8.ninja @@ -10,4 +10,5 @@ target_output_name = webrtc_vp8 ~ build obj/third_party/webrtc/modules/video_coding/webrtc_vp8.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_coding/webrtc_vp8.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_coding/webrtc_vp8.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_coding/webrtc_vp9.ninja b/obj/third_party/webrtc/modules/video_coding/webrtc_vp9.ninja index 44f9c25..59f6a51 100644 --- a/obj/third_party/webrtc/modules/video_coding/webrtc_vp9.ninja +++ b/obj/third_party/webrtc/modules/video_coding/webrtc_vp9.ninja @@ -10,4 +10,5 @@ target_output_name = webrtc_vp9 ~ build obj/third_party/webrtc/modules/video_coding/webrtc_vp9.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_coding/webrtc_vp9.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_coding/webrtc_vp9.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_processing/video_processing.ninja b/obj/third_party/webrtc/modules/video_processing/video_processing.ninja index db168a3..0034a86 100644 --- a/obj/third_party/webrtc/modules/video_processing/video_processing.ninja +++ b/obj/third_party/webrtc/modules/video_processing/video_processing.ninja @@ -10,4 +10,5 @@ target_output_name = video_processing ~ build obj/third_party/webrtc/modules/video_processing/video_processing.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_processing/video_processing.inputdeps ~ build obj/third_party/webrtc/modules/video_processing/video_processing.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_render/video_render.ninja b/obj/third_party/webrtc/modules/video_render/video_render.ninja index 584f7c5..2c0115e 100644 --- a/obj/third_party/webrtc/modules/video_render/video_render.ninja +++ b/obj/third_party/webrtc/modules/video_render/video_render.ninja @@ -10,4 +10,5 @@ target_output_name = video_render ~ build obj/third_party/webrtc/modules/video_render/video_render.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_render/video_render.inputdeps.stamp: ~ build obj/third_party/webrtc/modules/video_render/video_render.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/modules/video_render/video_render_module.ninja b/obj/third_party/webrtc/modules/video_render/video_render_module.ninja index 044bf09..abfd8a6 100644 --- a/obj/third_party/webrtc/modules/video_render/video_render_module.ninja +++ b/obj/third_party/webrtc/modules/video_render/video_render_module.ninja @@ -10,4 +10,5 @@ target_output_name = video_render_module ~ build obj/third_party/webrtc/modules/video_render/video_render_module.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -29,4 +30,5 @@ build obj/third_party/webrtc/modules/video_render/video_render_module.inputdeps. ~ build obj/third_party/webrtc/modules/video_render/video_render_module.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/system_wrappers/system_wrappers.ninja b/obj/third_party/webrtc/system_wrappers/system_wrappers.ninja index e9fb09d..9a8cb8a 100644 --- a/obj/third_party/webrtc/system_wrappers/system_wrappers.ninja +++ b/obj/third_party/webrtc/system_wrappers/system_wrappers.ninja @@ -9,8 +9,9 @@ target_output_name = system_wrappers ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = winmm.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/webrtc/system_wrappers/system_wrappers.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/third_party/webrtc/system_wrappers/system_wrappers.inputdeps.stamp: build obj/third_party/webrtc/system_wrappers/system_wrappers.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -52,4 +55,5 @@ build obj/third_party/webrtc/system_wrappers/system_wrappers.lib: obj/third_party/webrtc/system_wrappers/system_wrappers/trace_win.obj ~ obj/third_party/webrtc/webrtc_common.stamp ~ +| ~ || ~ ~ diff --git a/obj/third_party/webrtc/system_wrappers/system_wrappers_default.ninja b/obj/third_party/webrtc/system_wrappers/system_wrappers_default.ninja index 518eaf1..a3800d1 100644 --- a/obj/third_party/webrtc/system_wrappers/system_wrappers_default.ninja +++ b/obj/third_party/webrtc/system_wrappers/system_wrappers_default.ninja @@ -8,4 +8,5 @@ target_output_name = system_wrappers_default ~ build obj/third_party/webrtc/system_wrappers/system_wrappers_default.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -13,4 +14,5 @@ build obj/third_party/webrtc/system_wrappers/system_wrappers_default.inputdeps.s ~ build obj/third_party/webrtc/system_wrappers/system_wrappers_default.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/tools/frame_analyzer.ninja b/obj/third_party/webrtc/tools/frame_analyzer.ninja index fad53db..c794785 100644 --- a/obj/third_party/webrtc/tools/frame_analyzer.ninja +++ b/obj/third_party/webrtc/tools/frame_analyzer.ninja @@ -9,9 +9,12 @@ target_output_name = frame_analyzer ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./frame_analyzer.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -138,7 +141,9 @@ build ./frame_analyzer.exe: obj/third_party/webrtc/webrtc_common/common_types.obj ~ obj/third_party/webrtc/webrtc_common/config.obj ~ +| ~ || ~ ~ build obj/third_party/webrtc/tools/frame_analyzer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/webrtc/tools/rgba_to_i420_converter.ninja b/obj/third_party/webrtc/tools/rgba_to_i420_converter.ninja index 4f8ed4f..51f8522 100644 --- a/obj/third_party/webrtc/tools/rgba_to_i420_converter.ninja +++ b/obj/third_party/webrtc/tools/rgba_to_i420_converter.ninja @@ -9,9 +9,12 @@ target_output_name = rgba_to_i420_converter ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./rgba_to_i420_converter.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -137,7 +140,9 @@ build ./rgba_to_i420_converter.exe: obj/third_party/webrtc/webrtc_common/common_types.obj ~ obj/third_party/webrtc/webrtc_common/config.obj ~ +| ~ || ~ ~ build obj/third_party/webrtc/tools/rgba_to_i420_converter.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/third_party/webrtc/tools/video_quality_analysis.ninja b/obj/third_party/webrtc/tools/video_quality_analysis.ninja index 9f65fef..86bc82b 100644 --- a/obj/third_party/webrtc/tools/video_quality_analysis.ninja +++ b/obj/third_party/webrtc/tools/video_quality_analysis.ninja @@ -10,4 +10,5 @@ target_output_name = video_quality_analysis ~ build obj/third_party/webrtc/tools/video_quality_analysis.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -28,4 +29,5 @@ build obj/third_party/webrtc/tools/video_quality_analysis.inputdeps.stamp: ~ build obj/third_party/webrtc/tools/video_quality_analysis.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/video/video.ninja b/obj/third_party/webrtc/video/video.ninja index 10b6f94..f45f3dd 100644 --- a/obj/third_party/webrtc/video/video.ninja +++ b/obj/third_party/webrtc/video/video.ninja @@ -10,4 +10,5 @@ target_output_name = video ~ build obj/third_party/webrtc/video/video.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/third_party/webrtc/video/video.inputdeps.stamp: ~ build obj/third_party/webrtc/video/video.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/voice_engine/voice_engine.ninja b/obj/third_party/webrtc/voice_engine/voice_engine.ninja index 434973a..da7fe7e 100644 --- a/obj/third_party/webrtc/voice_engine/voice_engine.ninja +++ b/obj/third_party/webrtc/voice_engine/voice_engine.ninja @@ -10,4 +10,5 @@ target_output_name = voice_engine ~ build obj/third_party/webrtc/voice_engine/voice_engine.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/third_party/webrtc/voice_engine/voice_engine.inputdeps.stamp: ~ build obj/third_party/webrtc/voice_engine/voice_engine.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/webrtc/webrtc.ninja b/obj/third_party/webrtc/webrtc.ninja index 0da90e4..ce5b913 100644 --- a/obj/third_party/webrtc/webrtc.ninja +++ b/obj/third_party/webrtc/webrtc.ninja @@ -8,4 +8,5 @@ target_output_name = webrtc ~ build obj/third_party/webrtc/webrtc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/third_party/webrtc/webrtc.inputdeps.stamp: ~ build obj/third_party/webrtc/webrtc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/third_party/zlib/zip.ninja b/obj/third_party/zlib/zip.ninja index dd27167..e28622d 100644 --- a/obj/third_party/zlib/zip.ninja +++ b/obj/third_party/zlib/zip.ninja @@ -9,8 +9,9 @@ target_output_name = zip ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/third_party/zlib/zip.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/third_party/zlib/zip.inputdeps.stamp: build obj/third_party/zlib/zip.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -30,4 +33,5 @@ build obj/third_party/zlib/zip.lib: obj/third_party/zlib/zlib.lib ~ obj/third_party/zlib/zlib_x86_simd.lib ~ +| ~ || ~ ~ diff --git a/obj/tools/battor_agent/battor_agent.ninja b/obj/tools/battor_agent/battor_agent.ninja index bf3fa6a..3b5a35a 100644 --- a/obj/tools/battor_agent/battor_agent.ninja +++ b/obj/tools/battor_agent/battor_agent.ninja @@ -9,9 +9,12 @@ target_output_name = battor_agent ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./battor_agent.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1433,7 +1436,9 @@ build ./battor_agent.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/tools/battor_agent/battor_agent.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/tools/battor_agent/battor_agent_lib.ninja b/obj/tools/battor_agent/battor_agent_lib.ninja index 65a5806..edc27ac 100644 --- a/obj/tools/battor_agent/battor_agent_lib.ninja +++ b/obj/tools/battor_agent/battor_agent_lib.ninja @@ -10,4 +10,5 @@ target_output_name = battor_agent_lib ~ build obj/tools/battor_agent/battor_agent_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -36,4 +37,5 @@ build obj/tools/battor_agent/battor_agent_lib.inputdeps.stamp: ~ build obj/tools/battor_agent/battor_agent_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/tools/battor_agent/battor_agent_unittests.ninja b/obj/tools/battor_agent/battor_agent_unittests.ninja index 592bb75..672b093 100644 --- a/obj/tools/battor_agent/battor_agent_unittests.ninja +++ b/obj/tools/battor_agent/battor_agent_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = battor_agent_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./battor_agent_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -1489,7 +1492,9 @@ build ./battor_agent_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/tools/battor_agent/battor_agent_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/tools/gn/gn.ninja b/obj/tools/gn/gn.ninja index 0d42a73..87a4bff 100644 --- a/obj/tools/gn/gn.ninja +++ b/obj/tools/gn/gn.ninja @@ -9,9 +9,12 @@ target_output_name = gn ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gn.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -24,7 +27,9 @@ build ./gn.exe: obj/tools/gn/gn_lib.lib ~ obj/tools/gn/last_commit_position.stamp ~ +| ~ || ~ ~ build obj/tools/gn/gn.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/tools/gn/gn_lib.ninja b/obj/tools/gn/gn_lib.ninja index 99f7a51..879f8b9 100644 --- a/obj/tools/gn/gn_lib.ninja +++ b/obj/tools/gn/gn_lib.ninja @@ -11,8 +11,9 @@ target_output_name = gn_lib ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/tools/gn/gn_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -21,4 +22,6 @@ build obj/tools/gn/gn_lib.inputdeps.stamp: build obj/tools/gn/gn_lib.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -128,4 +131,5 @@ build obj/tools/gn/gn_lib.lib: obj/tools/gn/gn_lib/variables.obj ~ obj/tools/gn/gn_lib/visibility.obj ~ +| ~ || ~ ~ diff --git a/obj/tools/gn/gn_unittests.ninja b/obj/tools/gn/gn_unittests.ninja index 17f270e..1663d59 100644 --- a/obj/tools/gn/gn_unittests.ninja +++ b/obj/tools/gn/gn_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = gn_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./gn_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -512,7 +515,9 @@ build ./gn_unittests.exe: obj/tools/gn/gn_unittests/value_unittest.obj ~ obj/tools/gn/gn_unittests/visibility_unittest.obj ~ +| ~ || ~ ~ build obj/tools/gn/gn_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/tools/imagediff/imagediff.ninja b/obj/tools/imagediff/imagediff.ninja index 9d9f7bb..8a1e167 100644 --- a/obj/tools/imagediff/imagediff.ninja +++ b/obj/tools/imagediff/imagediff.ninja @@ -9,9 +9,12 @@ target_output_name = image_diff ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./image_diff.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -44,7 +47,9 @@ build ./image_diff.exe: obj/tools/imagediff/imagediff/image_diff.obj ~ obj/tools/imagediff/imagediff/image_diff_png.obj ~ +| ~ || ~ ~ build obj/tools/imagediff/imagediff.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/tools/json_schema_compiler/generated_api_util.ninja b/obj/tools/json_schema_compiler/generated_api_util.ninja index b263ff9..62ceaa9 100644 --- a/obj/tools/json_schema_compiler/generated_api_util.ninja +++ b/obj/tools/json_schema_compiler/generated_api_util.ninja @@ -10,4 +10,5 @@ target_output_name = generated_api_util ~ build obj/tools/json_schema_compiler/generated_api_util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/tools/json_schema_compiler/generated_api_util.inputdeps.stamp: ~ build obj/tools/json_schema_compiler/generated_api_util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/tools/json_schema_compiler/test/api.ninja b/obj/tools/json_schema_compiler/test/api.ninja index 42a39bd..8824eca 100644 --- a/obj/tools/json_schema_compiler/test/api.ninja +++ b/obj/tools/json_schema_compiler/test/api.ninja @@ -10,4 +10,5 @@ target_output_name = api ~ build obj/tools/json_schema_compiler/test/api.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/tools/json_schema_compiler/test/api.inputdeps.stamp: ~ build obj/tools/json_schema_compiler/test/api.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/tools/json_schema_compiler/test/test.ninja b/obj/tools/json_schema_compiler/test/test.ninja index 3357b3d..1738a38 100644 --- a/obj/tools/json_schema_compiler/test/test.ninja +++ b/obj/tools/json_schema_compiler/test/test.ninja @@ -10,4 +10,5 @@ target_output_name = test ~ build obj/tools/json_schema_compiler/test/test.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/tools/json_schema_compiler/test/test.inputdeps.stamp: ~ build obj/tools/json_schema_compiler/test/test.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/tools/perf/clear_system_cache/clear_system_cache.ninja b/obj/tools/perf/clear_system_cache/clear_system_cache.ninja index 4d3b6c8..d4c2c77 100644 --- a/obj/tools/perf/clear_system_cache/clear_system_cache.ninja +++ b/obj/tools/perf/clear_system_cache/clear_system_cache.ninja @@ -9,9 +9,12 @@ target_output_name = clear_system_cache ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./clear_system_cache.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -456,7 +459,9 @@ build ./clear_system_cache.exe: obj/third_party/zlib/zlib_x86_simd.lib ~ obj/tools/perf/clear_system_cache/clear_system_cache/clear_system_cache_main.obj ~ +| ~ || ~ ~ build obj/tools/perf/clear_system_cache/clear_system_cache.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/accessibility/accessibility.ninja b/obj/ui/accessibility/accessibility.ninja index 334459c..5e0caf9 100644 --- a/obj/ui/accessibility/accessibility.ninja +++ b/obj/ui/accessibility/accessibility.ninja @@ -10,4 +10,5 @@ target_output_name = accessibility ~ build obj/ui/accessibility/accessibility.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/ui/accessibility/accessibility.inputdeps.stamp: ~ build obj/ui/accessibility/accessibility.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/accessibility/accessibility_unittests.ninja b/obj/ui/accessibility/accessibility_unittests.ninja index ac42ede..de565ab 100644 --- a/obj/ui/accessibility/accessibility_unittests.ninja +++ b/obj/ui/accessibility/accessibility_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = accessibility_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./accessibility_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2318,7 +2321,9 @@ build ./accessibility_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/accessibility/accessibility_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/accessibility/ax_gen.ninja b/obj/ui/accessibility/ax_gen.ninja index d391eaa..23baf60 100644 --- a/obj/ui/accessibility/ax_gen.ninja +++ b/obj/ui/accessibility/ax_gen.ninja @@ -10,4 +10,5 @@ target_output_name = ax_gen ~ build obj/ui/accessibility/ax_gen.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -16,4 +17,5 @@ build obj/ui/accessibility/ax_gen.inputdeps.stamp: ~ build obj/ui/accessibility/ax_gen.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/accessibility/test_support.ninja b/obj/ui/accessibility/test_support.ninja index a61e6d2..06bc57e 100644 --- a/obj/ui/accessibility/test_support.ninja +++ b/obj/ui/accessibility/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/accessibility/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -43,4 +44,5 @@ build obj/ui/accessibility/test_support.inputdeps.stamp: ~ build obj/ui/accessibility/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/app_list/app_list.ninja b/obj/ui/app_list/app_list.ninja index eefbbc9..bef34fc 100644 --- a/obj/ui/app_list/app_list.ninja +++ b/obj/ui/app_list/app_list.ninja @@ -10,4 +10,5 @@ target_output_name = app_list ~ build obj/ui/app_list/app_list.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -57,4 +58,5 @@ build obj/ui/app_list/app_list.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/app_list/app_list_unittests.ninja b/obj/ui/app_list/app_list_unittests.ninja index 1ab5ec4..ec1effc 100644 --- a/obj/ui/app_list/app_list_unittests.ninja +++ b/obj/ui/app_list/app_list_unittests.ninja @@ -9,6 +9,6 @@ target_output_name = app_list_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib dwmapi.lib imm32.lib oleacc.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./app_list_unittests.exe: ~ @@ -16,5 +16,8 @@ build ./app_list_unittests.exe: ./libGLESv2.dll.lib ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -4323,7 +4326,9 @@ build ./app_list_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/app_list/app_list_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/app_list/test_support.ninja b/obj/ui/app_list/test_support.ninja index 738b9a6..1332694 100644 --- a/obj/ui/app_list/test_support.ninja +++ b/obj/ui/app_list/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib dwmapi.lib imm32.lib oleacc.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/ui/app_list/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -61,4 +62,6 @@ build obj/ui/app_list/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -193,4 +196,5 @@ build obj/ui/app_list/test_support.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/ui/aura/aura.ninja b/obj/ui/aura/aura.ninja index 7bdf1b8..a753c33 100644 --- a/obj/ui/aura/aura.ninja +++ b/obj/ui/aura/aura.ninja @@ -10,4 +10,5 @@ target_output_name = aura ~ build obj/ui/aura/aura.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/aura/aura.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/aura/aura_unittests.ninja b/obj/ui/aura/aura_unittests.ninja index 7283bf9..25a7d1a 100644 --- a/obj/ui/aura/aura_unittests.ninja +++ b/obj/ui/aura/aura_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = aura_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/ui/aura/bench.ninja b/obj/ui/aura/bench.ninja index c1ba204..4cbe00c 100644 --- a/obj/ui/aura/bench.ninja +++ b/obj/ui/aura/bench.ninja @@ -9,11 +9,14 @@ target_output_name = aura_bench ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./aura_bench.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3721,7 +3724,9 @@ build ./aura_bench.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/aura/bench.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/aura/demo.ninja b/obj/ui/aura/demo.ninja index dae327c..4184f0f 100644 --- a/obj/ui/aura/demo.ninja +++ b/obj/ui/aura/demo.ninja @@ -9,11 +9,14 @@ target_output_name = aura_demo ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./aura_demo.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3721,7 +3724,9 @@ build ./aura_demo.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/aura/demo.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/aura/test_support.ninja b/obj/ui/aura/test_support.ninja index 9c28027..fc2183a 100644 --- a/obj/ui/aura/test_support.ninja +++ b/obj/ui/aura/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/aura/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/aura/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/aura_extra/aura_extra.ninja b/obj/ui/aura_extra/aura_extra.ninja index 1a8c739..6f6fba6 100644 --- a/obj/ui/aura_extra/aura_extra.ninja +++ b/obj/ui/aura_extra/aura_extra.ninja @@ -10,4 +10,5 @@ target_output_name = aura_extra ~ build obj/ui/aura_extra/aura_extra.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/aura_extra/aura_extra.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/base/base.ninja b/obj/ui/base/base.ninja index 645d8e6..bb42753 100644 --- a/obj/ui/base/base.ninja +++ b/obj/ui/base/base.ninja @@ -10,4 +10,5 @@ target_output_name = ui_base ~ build obj/ui/base/base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -527,4 +528,5 @@ build obj/ui/base/base/window_open_disposition.obj: ~ build obj/ui/base/ui_base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/base/ime/ime.ninja b/obj/ui/base/ime/ime.ninja index 516caa1..709d5b4 100644 --- a/obj/ui/base/ime/ime.ninja +++ b/obj/ui/base/ime/ime.ninja @@ -10,4 +10,5 @@ target_output_name = ui_base_ime ~ build obj/ui/base/ime/ime.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -131,4 +132,5 @@ build obj/ui/base/ime/ime/tsf_input_scope.obj: ~ build obj/ui/base/ime/ui_base_ime.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/base/test_support.ninja b/obj/ui/base/test_support.ninja index 3af35d2..0b7b658 100644 --- a/obj/ui/base/test_support.ninja +++ b/obj/ui/base/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/base/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/base/test_support.inputdeps.stamp: ~ build obj/ui/base/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/compositor/compositor.ninja b/obj/ui/compositor/compositor.ninja index 86aeb6d..96fc703 100644 --- a/obj/ui/compositor/compositor.ninja +++ b/obj/ui/compositor/compositor.ninja @@ -10,4 +10,5 @@ target_output_name = compositor ~ build obj/ui/compositor/compositor.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/compositor/compositor.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/compositor/compositor_unittests.ninja b/obj/ui/compositor/compositor_unittests.ninja index faa9059..bf0ed69 100644 --- a/obj/ui/compositor/compositor_unittests.ninja +++ b/obj/ui/compositor/compositor_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = compositor_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/ui/compositor/test_support.ninja b/obj/ui/compositor/test_support.ninja index 15e22ea..9a7dd1d 100644 --- a/obj/ui/compositor/test_support.ninja +++ b/obj/ui/compositor/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/compositor/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/compositor/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/content_accelerators/content_accelerators.ninja b/obj/ui/content_accelerators/content_accelerators.ninja index 6b5fb07..d1e986e 100644 --- a/obj/ui/content_accelerators/content_accelerators.ninja +++ b/obj/ui/content_accelerators/content_accelerators.ninja @@ -10,4 +10,5 @@ target_output_name = content_accelerators ~ build obj/ui/content_accelerators/content_accelerators.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/ui/content_accelerators/content_accelerators.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/display/display_unittests.ninja b/obj/ui/display/display_unittests.ninja index 7c44bc7..c27b208 100644 --- a/obj/ui/display/display_unittests.ninja +++ b/obj/ui/display/display_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = display_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./display_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -491,7 +494,9 @@ build ./display_unittests.exe: obj/ui/gfx/geometry/geometry/vector3d_f.obj ~ obj/ui/gfx/gfx_export.stamp ~ +| ~ || ~ ~ build obj/ui/display/display_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/display/types/types.ninja b/obj/ui/display/types/types.ninja index 6d3f7fc..225e471 100644 --- a/obj/ui/display/types/types.ninja +++ b/obj/ui/display/types/types.ninja @@ -10,4 +10,5 @@ target_output_name = display_types ~ build obj/ui/display/types/display_types.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -24,4 +25,5 @@ build obj/ui/display/types/display_types.stamp: ~ build obj/ui/display/types/types.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/display/util/util.ninja b/obj/ui/display/util/util.ninja index 6158cc3..ff3ed81 100644 --- a/obj/ui/display/util/util.ninja +++ b/obj/ui/display/util/util.ninja @@ -10,4 +10,5 @@ target_output_name = display_util ~ build obj/ui/display/util/display_util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -25,4 +26,5 @@ build obj/ui/display/util/display_util.stamp: ~ build obj/ui/display/util/util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/events/blink/blink.ninja b/obj/ui/events/blink/blink.ninja index d0afaa7..05a1d9e 100644 --- a/obj/ui/events/blink/blink.ninja +++ b/obj/ui/events/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = blink ~ build obj/ui/events/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -48,4 +49,5 @@ build obj/ui/events/blink/blink.inputdeps.stamp: ~ build obj/ui/events/blink/blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/devices/devices.ninja b/obj/ui/events/devices/devices.ninja index 048e21b..e83d946 100644 --- a/obj/ui/events/devices/devices.ninja +++ b/obj/ui/events/devices/devices.ninja @@ -10,4 +10,5 @@ target_output_name = devices ~ build obj/ui/events/devices/devices.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/devices/devices.inputdeps.stamp: ~ build obj/ui/events/devices/devices.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/dom_keycode_converter.ninja b/obj/ui/events/dom_keycode_converter.ninja index 73e2e8a..17ea679 100644 --- a/obj/ui/events/dom_keycode_converter.ninja +++ b/obj/ui/events/dom_keycode_converter.ninja @@ -9,8 +9,9 @@ target_output_name = dom_keycode_converter ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .lib ~ build obj/ui/events/dom_keycode_converter.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -19,4 +20,6 @@ build obj/ui/events/dom_keycode_converter.inputdeps.stamp: build obj/ui/events/dom_keycode_converter.lib: ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -25,4 +28,5 @@ build obj/ui/events/dom_keycode_converter.lib: obj/third_party/modp_b64/modp_b64.stamp ~ obj/ui/events/dom_keycode_converter/keycode_converter.obj ~ +| ~ || ~ ~ diff --git a/obj/ui/events/events.ninja b/obj/ui/events/events.ninja index 4fd8e46..f472690 100644 --- a/obj/ui/events/events.ninja +++ b/obj/ui/events/events.ninja @@ -10,4 +10,5 @@ target_output_name = events ~ build obj/ui/events/events.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/events.inputdeps.stamp: ~ build obj/ui/events/events.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/events_base.ninja b/obj/ui/events/events_base.ninja index 9376b16..9157e08 100644 --- a/obj/ui/events/events_base.ninja +++ b/obj/ui/events/events_base.ninja @@ -10,4 +10,5 @@ target_output_name = events_base ~ build obj/ui/events/events_base.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/events_base.inputdeps.stamp: ~ build obj/ui/events/events_base.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/events_unittests.ninja b/obj/ui/events/events_unittests.ninja index 50b17bd..bbe62d5 100644 --- a/obj/ui/events/events_unittests.ninja +++ b/obj/ui/events/events_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = events_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dxguid.lib dwmapi.lib d2d1.lib d3d10_1.lib oleacc.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./events_unittests.exe: ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3499,7 +3502,9 @@ build ./events_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/events/events_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/events/gesture_detection.ninja b/obj/ui/events/gesture_detection.ninja index d5596f1..c8346e3 100644 --- a/obj/ui/events/gesture_detection.ninja +++ b/obj/ui/events/gesture_detection.ninja @@ -10,4 +10,5 @@ target_output_name = gesture_detection ~ build obj/ui/events/gesture_detection.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/gesture_detection.inputdeps.stamp: ~ build obj/ui/events/gesture_detection.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/gestures/blink/blink.ninja b/obj/ui/events/gestures/blink/blink.ninja index 85ccf58..1652707 100644 --- a/obj/ui/events/gestures/blink/blink.ninja +++ b/obj/ui/events/gestures/blink/blink.ninja @@ -10,4 +10,5 @@ target_output_name = blink ~ build obj/ui/events/gestures/blink/blink.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/gestures/blink/blink.inputdeps.stamp: ~ build obj/ui/events/gestures/blink/blink.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/ipc/events_ipc.ninja b/obj/ui/events/ipc/events_ipc.ninja index 4d354df..6d519b7 100644 --- a/obj/ui/events/ipc/events_ipc.ninja +++ b/obj/ui/events/ipc/events_ipc.ninja @@ -10,4 +10,5 @@ target_output_name = events_ipc ~ build obj/ui/events/ipc/events_ipc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/ui/events/ipc/events_ipc.inputdeps.stamp: ~ build obj/ui/events/ipc/events_ipc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/ozone/events_ozone_layout.ninja b/obj/ui/events/ozone/events_ozone_layout.ninja index 5e71a60..8ea757d 100644 --- a/obj/ui/events/ozone/events_ozone_layout.ninja +++ b/obj/ui/events/ozone/events_ozone_layout.ninja @@ -10,4 +10,5 @@ target_output_name = events_ozone_layout ~ build obj/ui/events/ozone/events_ozone_layout.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/ozone/events_ozone_layout.inputdeps.stamp: ~ build obj/ui/events/ozone/events_ozone_layout.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/events/platform/platform.ninja b/obj/ui/events/platform/platform.ninja index c00a85b..3596805 100644 --- a/obj/ui/events/platform/platform.ninja +++ b/obj/ui/events/platform/platform.ninja @@ -10,4 +10,5 @@ target_output_name = platform ~ build obj/ui/events/platform/platform.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ui/events/platform/platform.inputdeps.stamp: ~ build obj/ui/events/platform/platform.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/events/test_support.ninja b/obj/ui/events/test_support.ninja index fb9baf2..7ae1715 100644 --- a/obj/ui/events/test_support.ninja +++ b/obj/ui/events/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/events/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/events/test_support.inputdeps.stamp: ~ build obj/ui/events/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/gfx/geometry/geometry.ninja b/obj/ui/gfx/geometry/geometry.ninja index b9c3882..eb90e31 100644 --- a/obj/ui/gfx/geometry/geometry.ninja +++ b/obj/ui/gfx/geometry/geometry.ninja @@ -10,4 +10,5 @@ target_output_name = geometry ~ build obj/ui/gfx/geometry/geometry.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ui/gfx/geometry/geometry.inputdeps.stamp: ~ build obj/ui/gfx/geometry/geometry.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/gfx/gfx.ninja b/obj/ui/gfx/gfx.ninja index 4b854b1..c2f7d42 100644 --- a/obj/ui/gfx/gfx.ninja +++ b/obj/ui/gfx/gfx.ninja @@ -12,4 +12,5 @@ target_output_name = gfx ~ build obj/ui/gfx/gfx.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -32,4 +33,5 @@ build obj/ui/gfx/gfx.inputdeps.stamp: ~ build obj/ui/gfx/gfx.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/gfx/gfx_unittests.ninja b/obj/ui/gfx/gfx_unittests.ninja index 08c8538..845feea 100644 --- a/obj/ui/gfx/gfx_unittests.ninja +++ b/obj/ui/gfx/gfx_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = gfx_unittests ~ ~ ldflags = /DELAYLOAD$:d2d1.dll /DELAYLOAD$:d3d10_1.dll /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = d2d1.lib d3d10_1.lib imm32.lib oleacc.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib dwmapi.lib ~ output_extension = .exe ~ build ./gfx_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2349,7 +2352,9 @@ build ./gfx_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/gfx/gfx_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/gfx/ipc/ipc.ninja b/obj/ui/gfx/ipc/ipc.ninja index eb1916e..d051db3 100644 --- a/obj/ui/gfx/ipc/ipc.ninja +++ b/obj/ui/gfx/ipc/ipc.ninja @@ -10,4 +10,5 @@ target_output_name = gfx_ipc ~ build obj/ui/gfx/ipc/gfx_ipc.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -48,4 +49,5 @@ build obj/ui/gfx/ipc/gfx_ipc.stamp: ~ build obj/ui/gfx/ipc/ipc.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/gfx/test_support.ninja b/obj/ui/gfx/test_support.ninja index ffae096..7d7d710 100644 --- a/obj/ui/gfx/test_support.ninja +++ b/obj/ui/gfx/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/gfx/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/gfx/test_support.inputdeps.stamp: ~ build obj/ui/gfx/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/gl/gl.ninja b/obj/ui/gl/gl.ninja index 16cc9d9..6ca8b61 100644 --- a/obj/ui/gl/gl.ninja +++ b/obj/ui/gl/gl.ninja @@ -12,4 +12,5 @@ target_output_name = gl_wrapper ~ build obj/ui/gl/gl.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -460,4 +461,5 @@ build obj/ui/gl/gl_wrapper.stamp: ./libGLESv2.dll.lib ~ ./osmesa.dll ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/gl/gl_unittest_utils.ninja b/obj/ui/gl/gl_unittest_utils.ninja index fdb8399..17f50b4 100644 --- a/obj/ui/gl/gl_unittest_utils.ninja +++ b/obj/ui/gl/gl_unittest_utils.ninja @@ -10,4 +10,5 @@ target_output_name = gl_unittest_utils ~ build obj/ui/gl/gl_unittest_utils.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/gl/gl_unittest_utils.inputdeps.stamp: ~ build obj/ui/gl/gl_unittest_utils.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/gl/gl_unittests.ninja b/obj/ui/gl/gl_unittests.ninja index d86de5d..cb66a9f 100644 --- a/obj/ui/gl/gl_unittests.ninja +++ b/obj/ui/gl/gl_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = gl_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib dwmapi.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib oleacc.lib ~ output_extension = .exe ~ build ./gl_unittests.exe: ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2360,7 +2363,9 @@ build ./gl_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/gl/gl_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/gl/test_support.ninja b/obj/ui/gl/test_support.ninja index 3361c1d..147783b 100644 --- a/obj/ui/gl/test_support.ninja +++ b/obj/ui/gl/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/gl/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/gl/test_support.inputdeps.stamp: ~ build obj/ui/gl/test_support.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/keyboard/keyboard.ninja b/obj/ui/keyboard/keyboard.ninja index 179f6ee..8e6bc12 100644 --- a/obj/ui/keyboard/keyboard.ninja +++ b/obj/ui/keyboard/keyboard.ninja @@ -10,4 +10,5 @@ target_output_name = keyboard ~ build obj/ui/keyboard/keyboard.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/keyboard/keyboard.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/keyboard/keyboard_unittests.ninja b/obj/ui/keyboard/keyboard_unittests.ninja index 069c6f3..f342e6b 100644 --- a/obj/ui/keyboard/keyboard_unittests.ninja +++ b/obj/ui/keyboard/keyboard_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = keyboard_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib dxguid.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/ui/keyboard/keyboard_with_content.ninja b/obj/ui/keyboard/keyboard_with_content.ninja index ccea996..f5d2d9a 100644 --- a/obj/ui/keyboard/keyboard_with_content.ninja +++ b/obj/ui/keyboard/keyboard_with_content.ninja @@ -10,4 +10,5 @@ target_output_name = keyboard_with_content ~ build obj/ui/keyboard/keyboard_with_content.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -177,4 +178,5 @@ build obj/ui/keyboard/keyboard_with_content.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/message_center/message_center.ninja b/obj/ui/message_center/message_center.ninja index f8876c4..53120bb 100644 --- a/obj/ui/message_center/message_center.ninja +++ b/obj/ui/message_center/message_center.ninja @@ -12,4 +12,5 @@ target_output_name = message_center ~ build obj/ui/message_center/message_center.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -56,4 +57,5 @@ build obj/ui/message_center/message_center.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/message_center/message_center_unittests.ninja b/obj/ui/message_center/message_center_unittests.ninja index 25c70c5..0f0c8ca 100644 --- a/obj/ui/message_center/message_center_unittests.ninja +++ b/obj/ui/message_center/message_center_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = message_center_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/ui/message_center/test_support.ninja b/obj/ui/message_center/test_support.ninja index 2cda61b..fed1f83 100644 --- a/obj/ui/message_center/test_support.ninja +++ b/obj/ui/message_center/test_support.ninja @@ -10,4 +10,5 @@ target_output_name = test_support ~ build obj/ui/message_center/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/ui/message_center/test_support.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/metro_viewer/metro_viewer.ninja b/obj/ui/metro_viewer/metro_viewer.ninja index 801425d..c474331 100644 --- a/obj/ui/metro_viewer/metro_viewer.ninja +++ b/obj/ui/metro_viewer/metro_viewer.ninja @@ -10,4 +10,5 @@ target_output_name = metro_viewer ~ build obj/ui/metro_viewer/metro_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -31,4 +32,5 @@ build obj/ui/metro_viewer/metro_viewer.inputdeps.stamp: ~ build obj/ui/metro_viewer/metro_viewer.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/mojo/geometry/interfaces.ninja b/obj/ui/mojo/geometry/interfaces.ninja index 9317ed7..74c5b46 100644 --- a/obj/ui/mojo/geometry/interfaces.ninja +++ b/obj/ui/mojo/geometry/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/ui/mojo/geometry/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ui/mojo/geometry/interfaces.inputdeps.stamp: ~ build obj/ui/mojo/geometry/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/mojo/geometry/interfaces_cpp_sources.ninja b/obj/ui/mojo/geometry/interfaces_cpp_sources.ninja index dbf4c8b..50fd627 100644 --- a/obj/ui/mojo/geometry/interfaces_cpp_sources.ninja +++ b/obj/ui/mojo/geometry/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/ui/mojo/geometry/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/ui/mojo/geometry/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/ui/mojo/geometry/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/mojo/geometry/util.ninja b/obj/ui/mojo/geometry/util.ninja index 71c62f8..f77f8f3 100644 --- a/obj/ui/mojo/geometry/util.ninja +++ b/obj/ui/mojo/geometry/util.ninja @@ -8,4 +8,5 @@ target_output_name = util ~ build obj/ui/mojo/geometry/util.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ui/mojo/geometry/util.inputdeps.stamp: ~ build obj/ui/mojo/geometry/util.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/mojo/ime/interfaces.ninja b/obj/ui/mojo/ime/interfaces.ninja index 10b06ee..56680d3 100644 --- a/obj/ui/mojo/ime/interfaces.ninja +++ b/obj/ui/mojo/ime/interfaces.ninja @@ -8,4 +8,5 @@ target_output_name = interfaces ~ build obj/ui/mojo/ime/interfaces.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/ui/mojo/ime/interfaces.inputdeps.stamp: ~ build obj/ui/mojo/ime/interfaces.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/mojo/ime/interfaces_cpp_sources.ninja b/obj/ui/mojo/ime/interfaces_cpp_sources.ninja index 61e45b1..87a52dc 100644 --- a/obj/ui/mojo/ime/interfaces_cpp_sources.ninja +++ b/obj/ui/mojo/ime/interfaces_cpp_sources.ninja @@ -10,4 +10,5 @@ target_output_name = interfaces_cpp_sources ~ build obj/ui/mojo/ime/interfaces_cpp_sources.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -17,4 +18,5 @@ build obj/ui/mojo/ime/interfaces_cpp_sources.inputdeps.stamp: ~ build obj/ui/mojo/ime/interfaces_cpp_sources.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/ui/mojo/init/init.ninja b/obj/ui/mojo/init/init.ninja index efb483d..8d3577f 100644 --- a/obj/ui/mojo/init/init.ninja +++ b/obj/ui/mojo/init/init.ninja @@ -10,4 +10,5 @@ target_output_name = init ~ build obj/ui/mojo/init/init.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -30,4 +31,5 @@ build obj/ui/mojo/init/init.inputdeps.stamp: ~ build obj/ui/mojo/init/init.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/native_theme/native_theme.ninja b/obj/ui/native_theme/native_theme.ninja index 8b66bca..852c64b 100644 --- a/obj/ui/native_theme/native_theme.ninja +++ b/obj/ui/native_theme/native_theme.ninja @@ -10,4 +10,5 @@ target_output_name = native_theme ~ build obj/ui/native_theme/native_theme.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/native_theme/native_theme.inputdeps.stamp: ~ build obj/ui/native_theme/native_theme.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/platform_window/platform_window.ninja b/obj/ui/platform_window/platform_window.ninja index 123ca40..16f1320 100644 --- a/obj/ui/platform_window/platform_window.ninja +++ b/obj/ui/platform_window/platform_window.ninja @@ -10,4 +10,5 @@ target_output_name = platform_window ~ build obj/ui/platform_window/platform_window.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/platform_window/platform_window.inputdeps.stamp: ~ build obj/ui/platform_window/platform_window.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/platform_window/stub/stub.ninja b/obj/ui/platform_window/stub/stub.ninja index e3ff6e2..0b4a64c 100644 --- a/obj/ui/platform_window/stub/stub.ninja +++ b/obj/ui/platform_window/stub/stub.ninja @@ -10,4 +10,5 @@ target_output_name = stub_window ~ build obj/ui/platform_window/stub/stub.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/ui/platform_window/stub/stub/stub_window.obj: ~ build obj/ui/platform_window/stub/stub_window.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/platform_window/win/win.ninja b/obj/ui/platform_window/win/win.ninja index a8908f4..2922b17 100644 --- a/obj/ui/platform_window/win/win.ninja +++ b/obj/ui/platform_window/win/win.ninja @@ -10,4 +10,5 @@ target_output_name = win_window ~ build obj/ui/platform_window/win/win.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -47,4 +48,5 @@ build obj/ui/platform_window/win/win/win_window.obj: ~ build obj/ui/platform_window/win/win_window.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/shell_dialogs/shell_dialogs.ninja b/obj/ui/shell_dialogs/shell_dialogs.ninja index 5ccedef..39b8a10 100644 --- a/obj/ui/shell_dialogs/shell_dialogs.ninja +++ b/obj/ui/shell_dialogs/shell_dialogs.ninja @@ -10,4 +10,5 @@ target_output_name = shell_dialogs ~ build obj/ui/shell_dialogs/shell_dialogs.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/shell_dialogs/shell_dialogs.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/shell_dialogs/shell_dialogs_unittests.ninja b/obj/ui/shell_dialogs/shell_dialogs_unittests.ninja index 2cb1318..1082eff 100644 --- a/obj/ui/shell_dialogs/shell_dialogs_unittests.ninja +++ b/obj/ui/shell_dialogs/shell_dialogs_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = shell_dialogs_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./shell_dialogs_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3559,7 +3562,9 @@ build ./shell_dialogs_unittests.exe: obj/win8/metro_viewer_constants.stamp ~ obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ +| ~ || ~ ~ build obj/ui/shell_dialogs/shell_dialogs_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/snapshot/snapshot.ninja b/obj/ui/snapshot/snapshot.ninja index 06503b4..6ed2641 100644 --- a/obj/ui/snapshot/snapshot.ninja +++ b/obj/ui/snapshot/snapshot.ninja @@ -10,4 +10,5 @@ target_output_name = snapshot ~ build obj/ui/snapshot/snapshot.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/ui/snapshot/snapshot.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/snapshot/snapshot_unittests.ninja b/obj/ui/snapshot/snapshot_unittests.ninja index d73b362..fcbe6a9 100644 --- a/obj/ui/snapshot/snapshot_unittests.ninja +++ b/obj/ui/snapshot/snapshot_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = snapshot_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib imm32.lib ~ output_extension = .exe ~ diff --git a/obj/ui/surface/surface.ninja b/obj/ui/surface/surface.ninja index 1d3bf65..396458c 100644 --- a/obj/ui/surface/surface.ninja +++ b/obj/ui/surface/surface.ninja @@ -10,4 +10,5 @@ target_output_name = surface ~ build obj/ui/surface/surface.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/ui/surface/surface.inputdeps.stamp: ~ build obj/ui/surface/surface.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/touch_selection/test_support.ninja b/obj/ui/touch_selection/test_support.ninja index 6b6e176..957b178 100644 --- a/obj/ui/touch_selection/test_support.ninja +++ b/obj/ui/touch_selection/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/ui/touch_selection/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,6 @@ build obj/ui/touch_selection/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -162,4 +165,5 @@ build obj/ui/touch_selection/test_support.lib: obj/ui/touch_selection/ui_touch_selection.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/ui/touch_selection/touch_selection.ninja b/obj/ui/touch_selection/touch_selection.ninja index 04adea9..e69392d 100644 --- a/obj/ui/touch_selection/touch_selection.ninja +++ b/obj/ui/touch_selection/touch_selection.ninja @@ -10,4 +10,5 @@ target_output_name = ui_touch_selection ~ build obj/ui/touch_selection/touch_selection.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -81,4 +82,5 @@ build obj/ui/touch_selection/ui_touch_selection.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/touch_selection/ui_touch_selection_unittests.ninja b/obj/ui/touch_selection/ui_touch_selection_unittests.ninja index cf36e9c..b2f3d9e 100644 --- a/obj/ui/touch_selection/ui_touch_selection_unittests.ninja +++ b/obj/ui/touch_selection/ui_touch_selection_unittests.ninja @@ -9,6 +9,6 @@ target_output_name = ui_touch_selection_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./ui_touch_selection_unittests.exe: ~ @@ -16,5 +16,8 @@ build ./ui_touch_selection_unittests.exe: ./libGLESv2.dll.lib ~ ./osmesa.dll ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3573,7 +3576,9 @@ build ./ui_touch_selection_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/touch_selection/ui_touch_selection_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/views/controls/webview/webview.ninja b/obj/ui/views/controls/webview/webview.ninja index 496aa31..6d6e51e 100644 --- a/obj/ui/views/controls/webview/webview.ninja +++ b/obj/ui/views/controls/webview/webview.ninja @@ -10,4 +10,5 @@ target_output_name = webview ~ build obj/ui/views/controls/webview/webview.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/ui/views/controls/webview/webview.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/views/examples/views_examples_exe.ninja b/obj/ui/views/examples/views_examples_exe.ninja index 4a68404..c71257a 100644 --- a/obj/ui/views/examples/views_examples_exe.ninja +++ b/obj/ui/views/examples/views_examples_exe.ninja @@ -9,11 +9,14 @@ target_output_name = views_examples_exe ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./views_examples_exe.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3971,7 +3974,9 @@ build ./views_examples_exe.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/views/examples/views_examples_exe.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/ui/views/examples/views_examples_lib.ninja b/obj/ui/views/examples/views_examples_lib.ninja index b9733fd..bb47c2c 100644 --- a/obj/ui/views/examples/views_examples_lib.ninja +++ b/obj/ui/views/examples/views_examples_lib.ninja @@ -10,4 +10,5 @@ target_output_name = views_examples_lib ~ build obj/ui/views/examples/views_examples_lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -59,4 +60,5 @@ build obj/ui/views/examples/views_examples_lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/views/examples/views_examples_with_content_exe.ninja b/obj/ui/views/examples/views_examples_with_content_exe.ninja index 5a5cb87..639f27c 100644 --- a/obj/ui/views/examples/views_examples_with_content_exe.ninja +++ b/obj/ui/views/examples/views_examples_with_content_exe.ninja @@ -9,6 +9,6 @@ target_output_name = views_examples_with_content_exe ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib comctl32.lib dinput8.lib sensorsapi.lib portabledeviceguids.lib -gen/base/allocator/allocator/libcmt.lib ~ output_extension = .exe ~ build ./views_examples_with_content_exe.exe: ~ diff --git a/obj/ui/views/mus/mus.ninja b/obj/ui/views/mus/mus.ninja index 79f644f..cd03360 100644 --- a/obj/ui/views/mus/mus.ninja +++ b/obj/ui/views/mus/mus.ninja @@ -10,4 +10,5 @@ target_output_name = ui_views_mus_lib ~ build obj/ui/views/mus/mus.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -128,4 +129,5 @@ build obj/ui/views/mus/ui_views_mus_lib.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/views/test_support.ninja b/obj/ui/views/test_support.ninja index 8788b35..1817484 100644 --- a/obj/ui/views/test_support.ninja +++ b/obj/ui/views/test_support.ninja @@ -11,8 +11,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib dwmapi.lib imm32.lib oleacc.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/ui/views/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -60,4 +61,6 @@ build obj/ui/views/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -212,4 +215,5 @@ build obj/ui/views/test_support.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/ui/views/views.ninja b/obj/ui/views/views.ninja index 94a4e01..c8f084f 100644 --- a/obj/ui/views/views.ninja +++ b/obj/ui/views/views.ninja @@ -12,4 +12,5 @@ target_output_name = views ~ build obj/ui/views/views.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -56,4 +57,5 @@ build obj/ui/views/views.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/views/views_unittests.ninja b/obj/ui/views/views_unittests.ninja index ebfe50f..f4c6d5f 100644 --- a/obj/ui/views/views_unittests.ninja +++ b/obj/ui/views/views_unittests.ninja @@ -9,5 +9,5 @@ target_output_name = views_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll -/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = imm32.lib oleacc.lib comctl32.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib gen/base/allocator/allocator/libcmt.lib dwmapi.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ diff --git a/obj/ui/web_dialogs/test_support.ninja b/obj/ui/web_dialogs/test_support.ninja index 6ad6394..a4e3b79 100644 --- a/obj/ui/web_dialogs/test_support.ninja +++ b/obj/ui/web_dialogs/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /DELAYLOAD$:BluetoothApis.dll /DELAYLOAD$:Bthprops.cpl /DELAYLOAD$:setupapi.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib comctl32.lib dinput8.lib dwmapi.lib dxguid.lib oleacc.lib sensorsapi.lib portabledeviceguids.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib d3d9.lib d3d11.lib dxva2.lib strmiids.lib crypt32.lib iphlpapi.lib secur32.lib d2d1.lib d3d10_1.lib imm32.lib winmm.lib ws2_32.lib ~ output_extension = .lib ~ build obj/ui/web_dialogs/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -178,4 +179,6 @@ build obj/ui/web_dialogs/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -485,4 +488,5 @@ build obj/ui/web_dialogs/test_support.lib: obj/win8/metro_viewer.stamp ~ obj/win8/metro_viewer_constants.stamp ~ +| ~ || ~ ~ diff --git a/obj/ui/web_dialogs/web_dialogs.ninja b/obj/ui/web_dialogs/web_dialogs.ninja index 276ea09..5aef8fb 100644 --- a/obj/ui/web_dialogs/web_dialogs.ninja +++ b/obj/ui/web_dialogs/web_dialogs.ninja @@ -10,4 +10,5 @@ target_output_name = web_dialogs ~ build obj/ui/web_dialogs/web_dialogs.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -174,4 +175,5 @@ build obj/ui/web_dialogs/web_dialogs.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/wm/test_support.ninja b/obj/ui/wm/test_support.ninja index b637f4a..9b6383c 100644 --- a/obj/ui/wm/test_support.ninja +++ b/obj/ui/wm/test_support.ninja @@ -9,8 +9,9 @@ target_output_name = test_support ~ ~ ldflags = /OPT$:ICF /DEBUG /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll ~ libs = +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .lib ~ build obj/ui/wm/test_support.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -55,4 +56,6 @@ build obj/ui/wm/test_support.lib: ./libGLESv2.dll.lib ~ alink ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -178,4 +181,5 @@ build obj/ui/wm/test_support.lib: obj/ui/wm/wm.stamp ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ diff --git a/obj/ui/wm/wm.ninja b/obj/ui/wm/wm.ninja index 7871f69..8ced211 100644 --- a/obj/ui/wm/wm.ninja +++ b/obj/ui/wm/wm.ninja @@ -12,4 +12,5 @@ target_output_name = wm ~ build obj/ui/wm/wm.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -53,4 +54,5 @@ build obj/ui/wm/wm.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/ui/wm/wm_unittests.ninja b/obj/ui/wm/wm_unittests.ninja index 6a35998..cbd45e6 100644 --- a/obj/ui/wm/wm_unittests.ninja +++ b/obj/ui/wm/wm_unittests.ninja @@ -9,11 +9,14 @@ target_output_name = wm_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /DELAYLOAD$:mf.dll /DELAYLOAD$:mfplat.dll /DELAYLOAD$:mfreadwrite.dll /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib imm32.lib dxguid.lib mf.lib mfplat.lib mfreadwrite.lib mfuuid.lib ~ output_extension = .exe ~ build ./wm_unittests.exe: ~ ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -3738,7 +3741,9 @@ build ./wm_unittests.exe: obj/url/url/url_util.obj ~ obj/url/url_lib.stamp ~ +| ~ || ~ ~ build obj/ui/wm/wm_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/url/url.ninja b/obj/url/url.ninja index 1f211cb..b868bd9 100644 --- a/obj/url/url.ninja +++ b/obj/url/url.ninja @@ -10,4 +10,5 @@ target_output_name = url_lib ~ build obj/url/url.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -142,4 +143,5 @@ build obj/url/url/url_util.obj: ~ build obj/url/url_lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ diff --git a/obj/url/url_unittests.ninja b/obj/url/url_unittests.ninja index d6a5377..2f793de 100644 --- a/obj/url/url_unittests.ninja +++ b/obj/url/url_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = url_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./url_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -488,7 +491,9 @@ build ./url_unittests.exe: obj/url/url_unittests/url_parse_unittest.obj ~ obj/url/url_unittests/url_util_unittest.obj ~ +| ~ || ~ ~ build obj/url/url_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/delegate_execute/delegate_execute.ninja b/obj/win8/delegate_execute/delegate_execute.ninja index 77c13b6..dfb6e4f 100644 --- a/obj/win8/delegate_execute/delegate_execute.ninja +++ b/obj/win8/delegate_execute/delegate_execute.ninja @@ -9,9 +9,12 @@ target_output_name = delegate_execute ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./delegate_execute.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2347,7 +2350,9 @@ build ./delegate_execute.exe: obj/win8/metro_viewer_constants.stamp ~ obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ +| ~ || ~ ~ build obj/win8/delegate_execute/delegate_execute.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/delegate_execute/delegate_execute_unittests.ninja b/obj/win8/delegate_execute/delegate_execute_unittests.ninja index 8152ed3..b22b8db 100644 --- a/obj/win8/delegate_execute/delegate_execute_unittests.ninja +++ b/obj/win8/delegate_execute/delegate_execute_unittests.ninja @@ -9,9 +9,12 @@ target_output_name = delegate_execute_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .exe ~ build ./delegate_execute_unittests.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2396,7 +2399,9 @@ build ./delegate_execute_unittests.exe: obj/win8/metro_viewer_constants.stamp ~ obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ +| ~ || ~ ~ build obj/win8/delegate_execute/delegate_execute_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/delegate_execute/lib.ninja b/obj/win8/delegate_execute/lib.ninja index 011d2d9..2b20d1d 100644 --- a/obj/win8/delegate_execute/lib.ninja +++ b/obj/win8/delegate_execute/lib.ninja @@ -10,4 +10,5 @@ target_output_name = lib ~ build obj/win8/delegate_execute/lib.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -54,4 +55,5 @@ build obj/win8/delegate_execute/lib.inputdeps.stamp: ~ build obj/win8/delegate_execute/lib.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/win8/metro_driver/ime/ime.ninja b/obj/win8/metro_driver/ime/ime.ninja index 64d1744..40632d3 100644 --- a/obj/win8/metro_driver/ime/ime.ninja +++ b/obj/win8/metro_driver/ime/ime.ninja @@ -10,4 +10,5 @@ target_output_name = ime ~ build obj/win8/metro_driver/ime/ime.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -41,4 +42,5 @@ build obj/win8/metro_driver/ime/ime.inputdeps.stamp: ~ build obj/win8/metro_driver/ime/ime.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/win8/metro_driver/metro_driver.ninja b/obj/win8/metro_driver/metro_driver.ninja index 9fb1c24..ab9cdd0 100644 --- a/obj/win8/metro_driver/metro_driver.ninja +++ b/obj/win8/metro_driver/metro_driver.ninja @@ -9,8 +9,11 @@ target_output_name = metro_driver ~ ~ ldflags = /DELAYLOAD$:API-MS-WIN-CORE-WINRT-ERROR-L1-1-0.DLL /DELAYLOAD$:API-MS-WIN-CORE-WINRT-L1-1-0.DLL /DELAYLOAD$:API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = D2D1.lib D3D11.lib runtimeobject.lib advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib d2d1.lib d3d10_1.lib dwmapi.lib oleacc.lib ~ output_extension = .dll ~ build ./metro_driver.dll ./metro_driver.dll.lib: ~ +gen/base/allocator/allocator/libcmt.lib ~ + obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -2383,7 +2386,9 @@ build ./metro_driver.dll ./metro_driver.dll.lib: obj/win8/metro_viewer_constants/metro_viewer_constants.obj ~ solink ~ +| ~ || ~ ~ build obj/win8/metro_driver/metro_driver.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/metro_driver/metro_driver_unittests.ninja b/obj/win8/metro_driver/metro_driver_unittests.ninja index 3673823..576c4ce 100644 --- a/obj/win8/metro_driver/metro_driver_unittests.ninja +++ b/obj/win8/metro_driver/metro_driver_unittests.ninja @@ -9,10 +9,13 @@ target_output_name = metro_driver_unittests ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:CONSOLE,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./metro_driver_unittests.exe: ~ ./metro_driver.dll.lib ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ @@ -876,7 +879,9 @@ build ./metro_driver_unittests.exe: obj/win8/metro_driver/metro_driver_unittests/winrt_utils.obj ~ obj/win8/metro_driver/metro_driver_unittests/winrt_utils_unittest.obj ~ +| ~ || ~ ~ build obj/win8/metro_driver/metro_driver_unittests.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/metro_viewer.ninja b/obj/win8/metro_viewer.ninja index 4d85557..afe965d 100644 --- a/obj/win8/metro_viewer.ninja +++ b/obj/win8/metro_viewer.ninja @@ -10,4 +10,5 @@ target_output_name = metro_viewer ~ build obj/win8/metro_viewer.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -51,4 +52,5 @@ build obj/win8/metro_viewer.stamp: ./libEGL.dll.lib ~ ./libGLESv2.dll.lib ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_i18n.stamp ~ diff --git a/obj/win8/test_registrar.ninja b/obj/win8/test_registrar.ninja index 62d43a8..211ac5f 100644 --- a/obj/win8/test_registrar.ninja +++ b/obj/win8/test_registrar.ninja @@ -9,9 +9,12 @@ target_output_name = test_registrar ~ ~ ldflags = /OPT$:ICF /DEBUG /MACHINE$:X64 /FIXED$:NO /ignore$:4199 /ignore$:4221 /NXCOMPAT /maxilksize$:2147483647 /DYNAMICBASE /DELAYLOAD$:dbghelp.dll /DELAYLOAD$:dwmapi.dll /DELAYLOAD$:shell32.dll /DELAYLOAD$:uxtheme.dll /INCREMENTAL$:NO /SUBSYSTEM$:WINDOWS,5.02 /DELAYLOAD$:cfgmgr32.dll /DELAYLOAD$:powrprof.dll /DELAYLOAD$:setupapi.dll +/NODEFAULTLIB$:libcmt /NODEFAULTLIB$:libcmtd /LIBPATH:"C$:/Program$ Files$ (x86)/Windows$ Kits/8.1/Lib/winv6.3/um/x64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/lib/amd64" /LIBPATH:"C$:/Program$ Files$ (x86)/Microsoft$ Visual$ Studio$ 12.0/VC/atlmfc/lib/amd64" ~ libs = advapi32.lib comdlg32.lib dbghelp.lib delayimp.lib dnsapi.lib gdi32.lib kernel32.lib msimg32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib shlwapi.lib user32.lib usp10.lib uuid.lib version.lib wininet.lib winmm.lib winspool.lib ws2_32.lib +gen/base/allocator/allocator/libcmt.lib cfgmgr32.lib netapi32.lib powrprof.lib setupapi.lib ~ output_extension = .exe ~ build ./test_registrar.exe: ~ +gen/base/allocator/allocator/libcmt.lib ~ link ~ +obj/base/allocator/allocator_shim.stamp ~ + obj/base/allocator/allocator_shim/allocator_shim_win.obj ~ obj/base/base.lib ~ obj/base/base_paths.lib ~ @@ -26,4 +29,5 @@ build ./test_registrar.exe: obj/win8/test_registrar_constants.stamp ~ obj/win8/test_registrar_constants/test_registrar_constants.obj ~ +| ~ || ~ ~ @@ -31,4 +35,5 @@ build obj/win8/test_registrar.inputdeps.stamp: obj/ash/resources/resources_grit.stamp ~ obj/ash/strings/strings_grit.stamp ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ diff --git a/obj/win8/test_support_win8.ninja b/obj/win8/test_support_win8.ninja index af5ea38..5832b8e 100644 --- a/obj/win8/test_support_win8.ninja +++ b/obj/win8/test_support_win8.ninja @@ -10,4 +10,5 @@ target_output_name = test_support_win8 ~ build obj/win8/test_support_win8.inputdeps.stamp: ~ +obj/base/allocator/prep_libc.stamp ~ obj/base/debugging_flags.stamp ~ obj/base/trace_event/etw_manifest/chrome_events_win.stamp ~ @@ -15,4 +16,5 @@ build obj/win8/test_support_win8.inputdeps.stamp: ~ build obj/win8/test_support_win8.stamp: ~ +obj/base/allocator/allocator_shim.stamp ~ obj/base/base.lib ~ obj/base/base_paths.lib ~