API tools faq
paste
Guest User

Untitled

a guest
Dec 4th, 2015
90
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 178.81 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Debug/obj/ash/ash_shell_with_content.ninja b/Debug/obj/ash/ash_shell_with_content.ninja
  2. index 2a98d9e..8d16151 100644
  3. --- a/Debug/obj/ash/ash_shell_with_content.ninja
  4. +++ b/Debug/obj/ash/ash_shell_with_content.ninja
  5. @@ -608,8 +608,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  6.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  7.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  8.      -DTOOLKIT_VIEWS=1 -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 $
  9. -    -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  10. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  11. +    -DGTEST_LANG_CXX11=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  12. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  13.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  14.      -D_UNICODE -DUNICODE -D_DEBUG
  15.  asmflags =
  16. diff --git a/Debug/obj/ash/ash_unittests.ninja b/Debug/obj/ash/ash_unittests.ninja
  17. index 455b1c8..8a843dd 100644
  18. --- a/Debug/obj/ash/ash_unittests.ninja
  19. +++ b/Debug/obj/ash/ash_unittests.ninja
  20. @@ -583,8 +583,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  21.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  22.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  23.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  24. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  25. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  26. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  27. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  28.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  29.      -D_UNICODE -DUNICODE -D_DEBUG
  30.  asmflags =
  31. diff --git a/Debug/obj/base/allocator/allocator.ninja b/Debug/obj/base/allocator/allocator.ninja
  32. index 116b3f1..0f95b70 100644
  33. --- a/Debug/obj/base/allocator/allocator.ninja
  34. +++ b/Debug/obj/base/allocator/allocator.ninja
  35. @@ -31,12 +31,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  36.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  37.      -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  38.      -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  39. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DTCMALLOC_FOR_DEBUGALLOCATION $
  40. -    -D_UNICODE -DUNICODE -D_DEBUG
  41. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  42.  asmflags =
  43.  rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
  44. -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  45. -    -I..\..
  46. +includes = -Igen -I..\..\third_party\wtl\include -I..\..
  47.  midl_includes =
  48.  cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
  49.      /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
  50. diff --git a/Debug/obj/base/allocator/allocator_unittests.ninja b/Debug/obj/base/allocator/allocator_unittests.ninja
  51. index 893c6cd..5859666 100644
  52. --- a/Debug/obj/base/allocator/allocator_unittests.ninja
  53. +++ b/Debug/obj/base/allocator/allocator_unittests.ninja
  54. @@ -7,8 +7,7 @@ asm = $ml_x86
  55.  build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
  56.      obj\base\allocator\allocator.lib $
  57.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  58. -    gen\allocator\libcmt.lib $
  59. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
  60. +    gen\allocator\libcmt.lib
  61.  
  62.  build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
  63.      gen\allocator\libcmt.lib gen\allocator\libcmt.lib
  64. @@ -38,10 +37,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  65.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  66.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  67.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  68. -    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= $
  69. -    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  70. -    -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  71. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  72. +    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DUSE_LIBPCI=1 $
  73. +    -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  74. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  75. +    -D_UNICODE -DUNICODE -D_DEBUG
  76.  asmflags =
  77.  rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
  78.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  79. @@ -87,7 +86,7 @@ build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
  80.      obj\base\allocator\allocator_unittests.allocator_unittest.obj $
  81.      obj\base\allocator\allocator.lib $
  82.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  83. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
  84. +    | $
  85.      obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
  86.      ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
  87.    binary = allocator_unittests.exe
  88. diff --git a/Debug/obj/base/base_unittests.ninja b/Debug/obj/base/base_unittests.ninja
  89. index a273ebe..d8ec131 100644
  90. --- a/Debug/obj/base/base_unittests.ninja
  91. +++ b/Debug/obj/base/base_unittests.ninja
  92. @@ -52,10 +52,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  93.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  94.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST $
  95.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  96. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  97. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  98. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  99. -    -D_UNICODE -DUNICODE -D_DEBUG
  100. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  101. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  102. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  103.  asmflags =
  104.  rcflags = /I..\.. /Igen /I..\..\base /d_DEBUG /l409
  105.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  106. diff --git a/Debug/obj/build/All.ninja b/Debug/obj/build/All.ninja
  107. index bb7668f..359c334 100644
  108. --- a/Debug/obj/build/All.ninja
  109. +++ b/Debug/obj/build/All.ninja
  110. @@ -1146,11 +1146,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  111.      "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", $
  112.      \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" -DGL_APICALL= $
  113.      -DEGLAPI= -DANGLE_ENABLE_D3D9 -DANGLE_ENABLE_D3D11 $
  114. -    -DANGLE_ENABLE_OPENGL -DPERFTOOLS_DLL_DECL= -DOPENSSL_SMALL $
  115. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  116. -    -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  117. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DANGLE_ENABLE_DEBUG_ANNOTATIONS $
  118. -    -D_UNICODE -DUNICODE -D_DEBUG
  119. +    -DANGLE_ENABLE_OPENGL -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  120. +    -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  121. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  122. +    -DANGLE_ENABLE_DEBUG_ANNOTATIONS -D_UNICODE -DUNICODE -D_DEBUG
  123.  asmflags =
  124.  rcflags = /I..\.. /Igen /I..\..\build /d_DEBUG /l409
  125.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  126. diff --git a/Debug/obj/chrome/browser_tests.ninja b/Debug/obj/chrome/browser_tests.ninja
  127. index fa1f588..186d310 100644
  128. --- a/Debug/obj/chrome/browser_tests.ninja
  129. +++ b/Debug/obj/chrome/browser_tests.ninja
  130. @@ -2175,10 +2175,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  131.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  132.      "-DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"" $
  133.      -DI18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1 -DWEBRTC_CHROMIUM_BUILD $
  134. -    -DWEBRTC_WIN -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  135. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  136. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  137. -    -D_UNICODE -DUNICODE -D_DEBUG
  138. +    -DWEBRTC_WIN -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  139. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  140. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  141.  asmflags =
  142.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  143.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  144. diff --git a/Debug/obj/chrome/chrome_app_unittests.ninja b/Debug/obj/chrome/chrome_app_unittests.ninja
  145. index 9d4b8ef..8126500 100644
  146. --- a/Debug/obj/chrome/chrome_app_unittests.ninja
  147. +++ b/Debug/obj/chrome/chrome_app_unittests.ninja
  148. @@ -1181,10 +1181,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  149.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  150.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  151.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  152. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  153. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  154. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  155. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  156. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  157. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  158. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  159. +    -D_UNICODE -DUNICODE -D_DEBUG
  160.  asmflags =
  161.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  162.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  163. diff --git a/Debug/obj/chrome/chrome_child_dll.ninja b/Debug/obj/chrome/chrome_child_dll.ninja
  164. index 1ea7d3c..db7258f 100644
  165. --- a/Debug/obj/chrome/chrome_child_dll.ninja
  166. +++ b/Debug/obj/chrome/chrome_child_dll.ninja
  167. @@ -815,10 +815,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  168.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  169.      -DCHROME_MULTIPLE_DLL_CHILD -DMOJO_USE_SYSTEM_IMPL -DTOOLKIT_VIEWS=1 $
  170.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  171. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  172. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  173. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  174. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  175. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  176. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  177. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  178. +    -D_UNICODE -DUNICODE -D_DEBUG
  179.  asmflags =
  180.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  181.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  182. diff --git a/Debug/obj/chrome/chrome_main_dll.ninja b/Debug/obj/chrome/chrome_main_dll.ninja
  183. index c363aa2..0205fdd 100644
  184. --- a/Debug/obj/chrome/chrome_main_dll.ninja
  185. +++ b/Debug/obj/chrome/chrome_main_dll.ninja
  186. @@ -971,10 +971,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  187.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  188.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  189.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  190. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  191. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  192. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  193. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  194. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  195. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  196. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  197. +    -D_UNICODE -DUNICODE -D_DEBUG
  198.  asmflags =
  199.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  200.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  201. diff --git a/Debug/obj/chrome/interactive_ui_tests.ninja b/Debug/obj/chrome/interactive_ui_tests.ninja
  202. index a057db7..e16814e 100644
  203. --- a/Debug/obj/chrome/interactive_ui_tests.ninja
  204. +++ b/Debug/obj/chrome/interactive_ui_tests.ninja
  205. @@ -1196,10 +1196,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  206.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DHUNSPELL_STATIC $
  207.      -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DU_USING_ICU_NAMESPACE=0 $
  208.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  209. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  210. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  211. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  212. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  213. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  214. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  215. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  216. +    -D_UNICODE -DUNICODE -D_DEBUG
  217.  asmflags =
  218.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  219.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  220. diff --git a/Debug/obj/chrome/performance_browser_tests.ninja b/Debug/obj/chrome/performance_browser_tests.ninja
  221. index 80d6fd7..9092334 100644
  222. --- a/Debug/obj/chrome/performance_browser_tests.ninja
  223. +++ b/Debug/obj/chrome/performance_browser_tests.ninja
  224. @@ -1204,10 +1204,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  225.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  226.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  227.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  228. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  229. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  230. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  231. -    -D_UNICODE -DUNICODE -D_DEBUG
  232. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  233. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  234. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  235.  asmflags =
  236.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  237.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  238. diff --git a/Debug/obj/chrome/setup.ninja b/Debug/obj/chrome/setup.ninja
  239. index bdeed0c..0e111d3 100644
  240. --- a/Debug/obj/chrome/setup.ninja
  241. +++ b/Debug/obj/chrome/setup.ninja
  242. @@ -110,10 +110,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  243.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  244.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  245.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  246. -    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DPERFTOOLS_DLL_DECL= $
  247. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  248. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  249. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  250. +    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  251. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  252. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  253. +    -D_UNICODE -DUNICODE -D_DEBUG
  254.  asmflags =
  255.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  256.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  257. diff --git a/Debug/obj/chrome/setup_unittests.ninja b/Debug/obj/chrome/setup_unittests.ninja
  258. index 2527a69..0dcec37 100644
  259. --- a/Debug/obj/chrome/setup_unittests.ninja
  260. +++ b/Debug/obj/chrome/setup_unittests.ninja
  261. @@ -80,10 +80,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  262.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  263.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DU_USING_ICU_NAMESPACE=0 $
  264.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DUNIT_TEST $
  265. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  266. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  267. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  268. -    -D_UNICODE -DUNICODE -D_DEBUG
  269. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  270. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  271. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  272.  asmflags =
  273.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  274.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  275. diff --git a/Debug/obj/chrome/sync_integration_tests.ninja b/Debug/obj/chrome/sync_integration_tests.ninja
  276. index 5499bab..0c7dad0 100644
  277. --- a/Debug/obj/chrome/sync_integration_tests.ninja
  278. +++ b/Debug/obj/chrome/sync_integration_tests.ninja
  279. @@ -1193,10 +1193,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  280.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  281.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  282.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  283. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  284. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  285. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  286. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  287. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  288. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  289. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  290. +    -D_UNICODE -DUNICODE -D_DEBUG
  291.  asmflags =
  292.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  293.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  294. diff --git a/Debug/obj/chrome/sync_performance_tests.ninja b/Debug/obj/chrome/sync_performance_tests.ninja
  295. index cc71c7f..944b680 100644
  296. --- a/Debug/obj/chrome/sync_performance_tests.ninja
  297. +++ b/Debug/obj/chrome/sync_performance_tests.ninja
  298. @@ -1187,9 +1187,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  299.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  300.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  301.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  302. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  303. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  304. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  305. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DUSE_LIBPCI=1 $
  306. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  307.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  308.      -D_UNICODE -DUNICODE -D_DEBUG
  309.  asmflags =
  310. diff --git a/Debug/obj/chrome/unit_tests.ninja b/Debug/obj/chrome/unit_tests.ninja
  311. index 3e94308..cdc4251 100644
  312. --- a/Debug/obj/chrome/unit_tests.ninja
  313. +++ b/Debug/obj/chrome/unit_tests.ninja
  314. @@ -1456,10 +1456,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  315.      -DI18N_PHONENUMBERS_USE_ICU_REGEXP=1 $
  316.      -DI18N_PHONENUMBERS_NO_THREAD_SAFETY=1 -DWEBRTC_CHROMIUM_BUILD $
  317.      -DWEBRTC_WIN -DMESA_EGL_NO_X11_HEADERS -DHUNSPELL_STATIC $
  318. -    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DPERFTOOLS_DLL_DECL= $
  319. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  320. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  321. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  322. +    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  323. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  324. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  325. +    -D_UNICODE -DUNICODE -D_DEBUG
  326.  asmflags =
  327.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  328.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. -Igen\chrome $
  329. diff --git a/Debug/obj/components/components_browsertests.ninja b/Debug/obj/components/components_browsertests.ninja
  330. index 13234b8..d8333b6 100644
  331. --- a/Debug/obj/components/components_browsertests.ninja
  332. +++ b/Debug/obj/components/components_browsertests.ninja
  333. @@ -678,10 +678,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  334.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  335.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  336.      -DUNIT_TEST -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  337. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  338. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  339. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  340. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  341. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  342. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  343. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  344. +    -D_UNICODE -DUNICODE -D_DEBUG
  345.  asmflags =
  346.  rcflags = /I..\.. /Igen /I..\..\components /d_DEBUG /l409
  347.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  348. diff --git a/Debug/obj/components/components_perftests.ninja b/Debug/obj/components/components_perftests.ninja
  349. index bd11d32..3ba63b9 100644
  350. --- a/Debug/obj/components/components_perftests.ninja
  351. +++ b/Debug/obj/components/components_perftests.ninja
  352. @@ -526,9 +526,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  353.      -DPERF_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  354.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  355.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  356. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  357. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  358. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  359. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  360. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  361.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  362.      -D_UNICODE -DUNICODE -D_DEBUG
  363.  asmflags =
  364. diff --git a/Debug/obj/components/components_unittests.ninja b/Debug/obj/components/components_unittests.ninja
  365. index 4d08585..e28681e 100644
  366. --- a/Debug/obj/components/components_unittests.ninja
  367. +++ b/Debug/obj/components/components_unittests.ninja
  368. @@ -928,7 +928,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  369.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER $
  370.      "-DPRECACHE_CONFIG_SETTINGS_URL=\"https://www.gstatic.com/chrome/wifiprefetch/precache_config\"" $
  371.      "-DPRECACHE_MANIFEST_URL_PREFIX=\"https://www.gstatic.com/chrome/wifiprefetch/hosts/\"" $
  372. -    -DPERFTOOLS_DLL_DECL= -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  373. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  374.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  375.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  376.      -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  377. diff --git a/Debug/obj/components/test_runner/test_runner.ninja b/Debug/obj/components/test_runner/test_runner.ninja
  378. index 1fd5f12..40e01d3 100644
  379. --- a/Debug/obj/components/test_runner/test_runner.ninja
  380. +++ b/Debug/obj/components/test_runner/test_runner.ninja
  381. @@ -45,7 +45,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  382.      -DU_STATIC_IMPLEMENTATION -DGR_GL_FUNCTION_TYPE=__stdcall $
  383.      -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS $
  384.      -DSK_IGNORE_GL_TEXTURE_TARGET -DCHROME_PNG_WRITE_SUPPORT $
  385. -    -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  386. +    -DPNG_USER_CONFIG -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  387.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  388.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  389.      -D_UNICODE -DUNICODE -D_DEBUG
  390. diff --git a/Debug/obj/content/content_browsertests.ninja b/Debug/obj/content/content_browsertests.ninja
  391. index d215731..8eb90a3 100644
  392. --- a/Debug/obj/content/content_browsertests.ninja
  393. +++ b/Debug/obj/content/content_browsertests.ninja
  394. @@ -573,10 +573,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  395.      -DSK_IGNORE_GL_TEXTURE_TARGET -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 $
  396.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  397.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DMESA_EGL_NO_X11_HEADERS $
  398. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  399. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  400. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  401. -    -D_UNICODE -DUNICODE -D_DEBUG
  402. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  403. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  404. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  405.  asmflags =
  406.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  407.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  408. diff --git a/Debug/obj/content/content_gl_benchmark.ninja b/Debug/obj/content/content_gl_benchmark.ninja
  409. index 2046d17..5866294 100644
  410. --- a/Debug/obj/content/content_gl_benchmark.ninja
  411. +++ b/Debug/obj/content/content_gl_benchmark.ninja
  412. @@ -521,8 +521,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  413.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  414.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  415.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  416. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  417. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  418. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  419. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  420.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  421.      -D_UNICODE -DUNICODE -D_DEBUG
  422.  asmflags =
  423. diff --git a/Debug/obj/content/content_gl_tests.ninja b/Debug/obj/content/content_gl_tests.ninja
  424. index aebb895..cec7105 100644
  425. --- a/Debug/obj/content/content_gl_tests.ninja
  426. +++ b/Debug/obj/content/content_gl_tests.ninja
  427. @@ -523,8 +523,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  428.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  429.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  430.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  431. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  432. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  433. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  434. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  435.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  436.      -D_UNICODE -DUNICODE -D_DEBUG
  437.  asmflags =
  438. diff --git a/Debug/obj/content/content_perftests.ninja b/Debug/obj/content/content_perftests.ninja
  439. index f76bd51..aa4f18a 100644
  440. --- a/Debug/obj/content/content_perftests.ninja
  441. +++ b/Debug/obj/content/content_perftests.ninja
  442. @@ -518,10 +518,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  443.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  444.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  445.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  446. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  447. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  448. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  449. -    -D_UNICODE -DUNICODE -D_DEBUG
  450. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  451. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  452. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  453.  asmflags =
  454.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  455.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  456. diff --git a/Debug/obj/content/content_renderer.ninja b/Debug/obj/content/content_renderer.ninja
  457. index 3c3d9ec..29c9f67 100644
  458. --- a/Debug/obj/content/content_renderer.ninja
  459. +++ b/Debug/obj/content/content_renderer.ninja
  460. @@ -70,10 +70,10 @@ defines = -DCONTENT_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS $
  461.      -DU_STATIC_IMPLEMENTATION -DFEATURE_ENABLE_SSL $
  462.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  463.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  464. -    -DWEBRTC_WIN -DXML_STATIC -DPERFTOOLS_DLL_DECL= -DWEBRTC_CHROMIUM_BUILD $
  465. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  466. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  467. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  468. +    -DWEBRTC_WIN -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  469. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  470. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  471. +    -D_UNICODE -DUNICODE -D_DEBUG
  472.  asmflags =
  473.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  474.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  475. diff --git a/Debug/obj/content/content_shell.ninja b/Debug/obj/content/content_shell.ninja
  476. index 01a8a60..3539ca7 100644
  477. --- a/Debug/obj/content/content_shell.ninja
  478. +++ b/Debug/obj/content/content_shell.ninja
  479. @@ -551,7 +551,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  480.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  481.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  482.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  483. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  484. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  485.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  486.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  487.      -D_UNICODE -DUNICODE -D_DEBUG
  488. diff --git a/Debug/obj/content/content_shell_lib.ninja b/Debug/obj/content/content_shell_lib.ninja
  489. index 30a214b..f08ab3f 100644
  490. --- a/Debug/obj/content/content_shell_lib.ninja
  491. +++ b/Debug/obj/content/content_shell_lib.ninja
  492. @@ -74,8 +74,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  493.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  494.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  495.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  496. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  497. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  498. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  499. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  500.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  501.      -D_UNICODE -DUNICODE -D_DEBUG
  502.  asmflags =
  503. diff --git a/Debug/obj/content/content_unittests.ninja b/Debug/obj/content/content_unittests.ninja
  504. index ffe5b19..9f83d6d 100644
  505. --- a/Debug/obj/content/content_unittests.ninja
  506. +++ b/Debug/obj/content/content_unittests.ninja
  507. @@ -527,10 +527,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  508.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  509.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  510.      -DWEBRTC_WIN -DXML_STATIC -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  511. -    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DPERFTOOLS_DLL_DECL= $
  512. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  513. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  514. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  515. +    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  516. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  517. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  518. +    -D_UNICODE -DUNICODE -D_DEBUG
  519.  asmflags =
  520.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  521.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  522. diff --git a/Debug/obj/content/video_decode_accelerator_unittest.ninja b/Debug/obj/content/video_decode_accelerator_unittest.ninja
  523. index baf7798..22c9e2c 100644
  524. --- a/Debug/obj/content/video_decode_accelerator_unittest.ninja
  525. +++ b/Debug/obj/content/video_decode_accelerator_unittest.ninja
  526. @@ -489,8 +489,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  527.      -DUNIT_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  528.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  529.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  530. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  531. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  532. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  533. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  534.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  535.      -D_UNICODE -DUNICODE -D_DEBUG
  536.  asmflags =
  537. diff --git a/Debug/obj/extensions/extensions_browsertests.ninja b/Debug/obj/extensions/extensions_browsertests.ninja
  538. index a10bbe9..eeec5bb 100644
  539. --- a/Debug/obj/extensions/extensions_browsertests.ninja
  540. +++ b/Debug/obj/extensions/extensions_browsertests.ninja
  541. @@ -733,9 +733,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  542.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  543.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  544.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  545. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  546. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  547. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  548. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  549. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  550.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  551.      -D_UNICODE -DUNICODE -D_DEBUG
  552.  asmflags =
  553. diff --git a/Debug/obj/extensions/extensions_unittests.ninja b/Debug/obj/extensions/extensions_unittests.ninja
  554. index 7563354..47e76ca 100644
  555. --- a/Debug/obj/extensions/extensions_unittests.ninja
  556. +++ b/Debug/obj/extensions/extensions_unittests.ninja
  557. @@ -593,10 +593,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  558.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  559.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  560.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  561. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  562. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  563. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  564. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  565. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  566. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  567. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  568. +    -D_UNICODE -DUNICODE -D_DEBUG
  569.  asmflags =
  570.  rcflags = /I..\.. /Igen /I..\..\extensions /d_DEBUG /l409
  571.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  572. diff --git a/Debug/obj/extensions/shell/app_shell.ninja b/Debug/obj/extensions/shell/app_shell.ninja
  573. index fac4b21..ec890fc 100644
  574. --- a/Debug/obj/extensions/shell/app_shell.ninja
  575. +++ b/Debug/obj/extensions/shell/app_shell.ninja
  576. @@ -716,10 +716,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  577.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  578.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  579.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  580. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  581. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  582. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  583. -    -D_UNICODE -DUNICODE -D_DEBUG
  584. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  585. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  586. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  587.  asmflags =
  588.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /d_DEBUG /l409
  589.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  590. diff --git a/Debug/obj/extensions/shell/app_shell_unittests.ninja b/Debug/obj/extensions/shell/app_shell_unittests.ninja
  591. index 8d8ace5..fd187e7 100644
  592. --- a/Debug/obj/extensions/shell/app_shell_unittests.ninja
  593. +++ b/Debug/obj/extensions/shell/app_shell_unittests.ninja
  594. @@ -720,9 +720,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  595.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  596.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  597.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  598. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  599. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  600. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  601. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  602. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  603.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  604.      -D_UNICODE -DUNICODE -D_DEBUG
  605.  asmflags =
  606. diff --git a/Debug/obj/media/media_unittests.ninja b/Debug/obj/media/media_unittests.ninja
  607. index aabdc12..35b0d4c 100644
  608. --- a/Debug/obj/media/media_unittests.ninja
  609. +++ b/Debug/obj/media/media_unittests.ninja
  610. @@ -106,10 +106,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  611.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  612.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  613.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  614. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  615. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  616. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  617. -    -D_UNICODE -DUNICODE -D_DEBUG
  618. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  619. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  620. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  621.  asmflags =
  622.  rcflags = /I..\.. /Igen /I..\..\media /d_DEBUG /l409
  623.  includes = -Igen -I..\..\third_party\wtl\include $
  624. diff --git a/Debug/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja b/Debug/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  625. index c871d32..3ee56b0 100644
  626. --- a/Debug/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  627. +++ b/Debug/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  628. @@ -531,10 +531,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  629.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  630.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  631.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  632. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  633. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  634. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  635. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  636. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  637. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  638. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  639. +    -D_UNICODE -DUNICODE -D_DEBUG
  640.  asmflags =
  641.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\platform /d_DEBUG $
  642.      /l409
  643. diff --git a/Debug/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja b/Debug/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  644. index 47b1c69..943081f 100644
  645. --- a/Debug/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  646. +++ b/Debug/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  647. @@ -538,10 +538,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  648.      -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 $
  649.      -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_WEB_AUDIO=1 $
  650.      -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 $
  651. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  652. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  653. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  654. -    -D_UNICODE -DUNICODE -D_DEBUG
  655. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  656. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  657. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  658.  asmflags =
  659.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\web /d_DEBUG /l409
  660.  includes = -Igen -I..\..\third_party\wtl\include $
  661. diff --git a/Debug/obj/ui/app_list/app_list_demo.ninja b/Debug/obj/ui/app_list/app_list_demo.ninja
  662. index 7f9dba8..9efff28 100644
  663. --- a/Debug/obj/ui/app_list/app_list_demo.ninja
  664. +++ b/Debug/obj/ui/app_list/app_list_demo.ninja
  665. @@ -564,10 +564,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  666.      -DGTEST_LANG_CXX11=0 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  667.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  668.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  669. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  670. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  671. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  672. -    -D_UNICODE -DUNICODE -D_DEBUG
  673. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  674. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  675. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  676.  asmflags =
  677.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /d_DEBUG /l409
  678.  includes = -Igen -I..\..\third_party\wtl\include $
  679. diff --git a/Debug/obj/ui/app_list/app_list_unittests.ninja b/Debug/obj/ui/app_list/app_list_unittests.ninja
  680. index fdb8aff..e522123 100644
  681. --- a/Debug/obj/ui/app_list/app_list_unittests.ninja
  682. +++ b/Debug/obj/ui/app_list/app_list_unittests.ninja
  683. @@ -165,8 +165,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  684.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  685.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  686.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  687. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  688. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  689. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  690. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  691.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  692.      -D_UNICODE -DUNICODE -D_DEBUG
  693.  asmflags =
  694. diff --git a/Debug/obj/ui/keyboard/keyboard_unittests.ninja b/Debug/obj/ui/keyboard/keyboard_unittests.ninja
  695. index 91d35b1..ee1b124 100644
  696. --- a/Debug/obj/ui/keyboard/keyboard_unittests.ninja
  697. +++ b/Debug/obj/ui/keyboard/keyboard_unittests.ninja
  698. @@ -146,8 +146,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  699.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  700.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  701.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  702. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  703. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  704. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  705. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  706.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  707.      -D_UNICODE -DUNICODE -D_DEBUG
  708.  asmflags =
  709. diff --git a/Debug/obj/ui/views/examples/views_examples_with_content_exe.ninja b/Debug/obj/ui/views/examples/views_examples_with_content_exe.ninja
  710. index e631ae8..f07545f 100644
  711. --- a/Debug/obj/ui/views/examples/views_examples_with_content_exe.ninja
  712. +++ b/Debug/obj/ui/views/examples/views_examples_with_content_exe.ninja
  713. @@ -562,7 +562,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  714.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  715.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  716.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  717. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  718. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  719.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  720.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  721.      -D_UNICODE -DUNICODE -D_DEBUG
  722. diff --git a/Debug/obj/ui/views/views_unittests.ninja b/Debug/obj/ui/views/views_unittests.ninja
  723. index 7859f03..b4c42a6 100644
  724. --- a/Debug/obj/ui/views/views_unittests.ninja
  725. +++ b/Debug/obj/ui/views/views_unittests.ninja
  726. @@ -161,8 +161,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  727.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  728.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  729.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  730. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  731. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  732. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  733. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  734.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  735.      -D_UNICODE -DUNICODE -D_DEBUG
  736.  asmflags =
  737. diff --git a/Debug_x64/obj/ash/ash_shell_with_content.ninja b/Debug_x64/obj/ash/ash_shell_with_content.ninja
  738. index 9a0a589..5465e28 100644
  739. --- a/Debug_x64/obj/ash/ash_shell_with_content.ninja
  740. +++ b/Debug_x64/obj/ash/ash_shell_with_content.ninja
  741. @@ -608,8 +608,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  742.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  743.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  744.      -DTOOLKIT_VIEWS=1 -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 $
  745. -    -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  746. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  747. +    -DGTEST_LANG_CXX11=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  748. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  749.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  750.      -D_UNICODE -DUNICODE -D_DEBUG
  751.  asmflags =
  752. diff --git a/Debug_x64/obj/ash/ash_unittests.ninja b/Debug_x64/obj/ash/ash_unittests.ninja
  753. index aae34f7..a87e93f 100644
  754. --- a/Debug_x64/obj/ash/ash_unittests.ninja
  755. +++ b/Debug_x64/obj/ash/ash_unittests.ninja
  756. @@ -583,8 +583,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  757.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  758.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  759.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  760. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  761. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  762. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  763. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  764.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  765.      -D_UNICODE -DUNICODE -D_DEBUG
  766.  asmflags =
  767. diff --git a/Debug_x64/obj/base/allocator/allocator.ninja b/Debug_x64/obj/base/allocator/allocator.ninja
  768. index 8e82d7a..e6e73d0 100644
  769. --- a/Debug_x64/obj/base/allocator/allocator.ninja
  770. +++ b/Debug_x64/obj/base/allocator/allocator.ninja
  771. @@ -31,12 +31,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  772.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  773.      -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  774.      -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  775. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DTCMALLOC_FOR_DEBUGALLOCATION $
  776. -    -D_UNICODE -DUNICODE -D_DEBUG
  777. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  778.  asmflags =
  779.  rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
  780. -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  781. -    -I..\..
  782. +includes = -Igen -I..\..\third_party\wtl\include -I..\..
  783.  midl_includes =
  784.  cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
  785.      /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
  786. diff --git a/Debug_x64/obj/base/allocator/allocator_unittests.ninja b/Debug_x64/obj/base/allocator/allocator_unittests.ninja
  787. index 227eead..6ba3666 100644
  788. --- a/Debug_x64/obj/base/allocator/allocator_unittests.ninja
  789. +++ b/Debug_x64/obj/base/allocator/allocator_unittests.ninja
  790. @@ -7,8 +7,7 @@ asm = $ml_x64
  791.  build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
  792.      obj\base\allocator\allocator.lib $
  793.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  794. -    gen\allocator\libcmt.lib $
  795. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
  796. +    gen\allocator\libcmt.lib
  797.  
  798.  build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
  799.      gen\allocator\libcmt.lib gen\allocator\libcmt.lib
  800. @@ -38,10 +37,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  801.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  802.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  803.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  804. -    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= $
  805. -    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  806. -    -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  807. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  808. +    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DUSE_LIBPCI=1 $
  809. +    -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  810. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  811. +    -D_UNICODE -DUNICODE -D_DEBUG
  812.  asmflags =
  813.  rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
  814.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  815. @@ -87,7 +86,7 @@ build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
  816.      obj\base\allocator\allocator_unittests.allocator_unittest.obj $
  817.      obj\base\allocator\allocator.lib $
  818.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  819. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
  820. +    | $
  821.      obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
  822.      ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
  823.    binary = allocator_unittests.exe
  824. diff --git a/Debug_x64/obj/base/base_unittests.ninja b/Debug_x64/obj/base/base_unittests.ninja
  825. index 2607282..984e394 100644
  826. --- a/Debug_x64/obj/base/base_unittests.ninja
  827. +++ b/Debug_x64/obj/base/base_unittests.ninja
  828. @@ -52,10 +52,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  829.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  830.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST $
  831.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  832. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  833. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  834. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  835. -    -D_UNICODE -DUNICODE -D_DEBUG
  836. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  837. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  838. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  839.  asmflags =
  840.  rcflags = /I..\.. /Igen /I..\..\base /d_DEBUG /l409
  841.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  842. diff --git a/Debug_x64/obj/build/All.ninja b/Debug_x64/obj/build/All.ninja
  843. index bd9dca3..8f66b41 100644
  844. --- a/Debug_x64/obj/build/All.ninja
  845. +++ b/Debug_x64/obj/build/All.ninja
  846. @@ -1146,11 +1146,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  847.      "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", $
  848.      \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" -DGL_APICALL= $
  849.      -DEGLAPI= -DANGLE_ENABLE_D3D9 -DANGLE_ENABLE_D3D11 $
  850. -    -DANGLE_ENABLE_OPENGL -DPERFTOOLS_DLL_DECL= -DOPENSSL_SMALL $
  851. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  852. -    -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  853. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DANGLE_ENABLE_DEBUG_ANNOTATIONS $
  854. -    -D_UNICODE -DUNICODE -D_DEBUG
  855. +    -DANGLE_ENABLE_OPENGL -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  856. +    -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  857. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  858. +    -DANGLE_ENABLE_DEBUG_ANNOTATIONS -D_UNICODE -DUNICODE -D_DEBUG
  859.  asmflags =
  860.  rcflags = /I..\.. /Igen /I..\..\build /d_DEBUG /l409
  861.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  862. diff --git a/Debug_x64/obj/chrome/browser_tests.ninja b/Debug_x64/obj/chrome/browser_tests.ninja
  863. index 26ac810..3733fe1 100644
  864. --- a/Debug_x64/obj/chrome/browser_tests.ninja
  865. +++ b/Debug_x64/obj/chrome/browser_tests.ninja
  866. @@ -2175,10 +2175,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  867.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  868.      "-DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"" $
  869.      -DI18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1 -DWEBRTC_CHROMIUM_BUILD $
  870. -    -DWEBRTC_WIN -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  871. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  872. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  873. -    -D_UNICODE -DUNICODE -D_DEBUG
  874. +    -DWEBRTC_WIN -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  875. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  876. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  877.  asmflags =
  878.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  879.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  880. diff --git a/Debug_x64/obj/chrome/chrome_app_unittests.ninja b/Debug_x64/obj/chrome/chrome_app_unittests.ninja
  881. index f9f3345..40ce8f5 100644
  882. --- a/Debug_x64/obj/chrome/chrome_app_unittests.ninja
  883. +++ b/Debug_x64/obj/chrome/chrome_app_unittests.ninja
  884. @@ -1181,10 +1181,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  885.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  886.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  887.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  888. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  889. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  890. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  891. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  892. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  893. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  894. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  895. +    -D_UNICODE -DUNICODE -D_DEBUG
  896.  asmflags =
  897.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  898.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  899. diff --git a/Debug_x64/obj/chrome/chrome_child_dll.ninja b/Debug_x64/obj/chrome/chrome_child_dll.ninja
  900. index 32923cb..6aabc9d 100644
  901. --- a/Debug_x64/obj/chrome/chrome_child_dll.ninja
  902. +++ b/Debug_x64/obj/chrome/chrome_child_dll.ninja
  903. @@ -815,10 +815,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  904.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  905.      -DCHROME_MULTIPLE_DLL_CHILD -DMOJO_USE_SYSTEM_IMPL -DTOOLKIT_VIEWS=1 $
  906.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  907. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  908. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  909. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  910. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  911. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  912. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  913. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  914. +    -D_UNICODE -DUNICODE -D_DEBUG
  915.  asmflags =
  916.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  917.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  918. diff --git a/Debug_x64/obj/chrome/chrome_main_dll.ninja b/Debug_x64/obj/chrome/chrome_main_dll.ninja
  919. index 48bae1a..cf6f130 100644
  920. --- a/Debug_x64/obj/chrome/chrome_main_dll.ninja
  921. +++ b/Debug_x64/obj/chrome/chrome_main_dll.ninja
  922. @@ -971,10 +971,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  923.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  924.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  925.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  926. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  927. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  928. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  929. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  930. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  931. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  932. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  933. +    -D_UNICODE -DUNICODE -D_DEBUG
  934.  asmflags =
  935.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  936.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  937. diff --git a/Debug_x64/obj/chrome/interactive_ui_tests.ninja b/Debug_x64/obj/chrome/interactive_ui_tests.ninja
  938. index 59e0682..7bff5a2 100644
  939. --- a/Debug_x64/obj/chrome/interactive_ui_tests.ninja
  940. +++ b/Debug_x64/obj/chrome/interactive_ui_tests.ninja
  941. @@ -1196,10 +1196,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  942.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DHUNSPELL_STATIC $
  943.      -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DU_USING_ICU_NAMESPACE=0 $
  944.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  945. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  946. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  947. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  948. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  949. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  950. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  951. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  952. +    -D_UNICODE -DUNICODE -D_DEBUG
  953.  asmflags =
  954.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  955.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  956. diff --git a/Debug_x64/obj/chrome/performance_browser_tests.ninja b/Debug_x64/obj/chrome/performance_browser_tests.ninja
  957. index 7aa6510..64a3496 100644
  958. --- a/Debug_x64/obj/chrome/performance_browser_tests.ninja
  959. +++ b/Debug_x64/obj/chrome/performance_browser_tests.ninja
  960. @@ -1204,10 +1204,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  961.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  962.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  963.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  964. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  965. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  966. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  967. -    -D_UNICODE -DUNICODE -D_DEBUG
  968. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  969. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  970. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  971.  asmflags =
  972.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  973.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  974. diff --git a/Debug_x64/obj/chrome/setup.ninja b/Debug_x64/obj/chrome/setup.ninja
  975. index 30520b4..cc93193 100644
  976. --- a/Debug_x64/obj/chrome/setup.ninja
  977. +++ b/Debug_x64/obj/chrome/setup.ninja
  978. @@ -110,10 +110,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  979.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  980.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  981.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  982. -    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DPERFTOOLS_DLL_DECL= $
  983. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  984. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  985. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  986. +    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  987. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  988. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  989. +    -D_UNICODE -DUNICODE -D_DEBUG
  990.  asmflags =
  991.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  992.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  993. diff --git a/Debug_x64/obj/chrome/setup_unittests.ninja b/Debug_x64/obj/chrome/setup_unittests.ninja
  994. index 6b30d42..f5a6927 100644
  995. --- a/Debug_x64/obj/chrome/setup_unittests.ninja
  996. +++ b/Debug_x64/obj/chrome/setup_unittests.ninja
  997. @@ -80,10 +80,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  998.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  999.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DU_USING_ICU_NAMESPACE=0 $
  1000.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DUNIT_TEST $
  1001. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1002. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1003. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1004. -    -D_UNICODE -DUNICODE -D_DEBUG
  1005. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1006. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1007. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1008.  asmflags =
  1009.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  1010.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1011. diff --git a/Debug_x64/obj/chrome/sync_integration_tests.ninja b/Debug_x64/obj/chrome/sync_integration_tests.ninja
  1012. index c2c921d..25d71d2 100644
  1013. --- a/Debug_x64/obj/chrome/sync_integration_tests.ninja
  1014. +++ b/Debug_x64/obj/chrome/sync_integration_tests.ninja
  1015. @@ -1193,10 +1193,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1016.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1017.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1018.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1019. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  1020. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1021. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1022. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1023. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  1024. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1025. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1026. +    -D_UNICODE -DUNICODE -D_DEBUG
  1027.  asmflags =
  1028.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  1029.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1030. diff --git a/Debug_x64/obj/chrome/sync_performance_tests.ninja b/Debug_x64/obj/chrome/sync_performance_tests.ninja
  1031. index ee69d58..3cdd32a 100644
  1032. --- a/Debug_x64/obj/chrome/sync_performance_tests.ninja
  1033. +++ b/Debug_x64/obj/chrome/sync_performance_tests.ninja
  1034. @@ -1187,9 +1187,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1035.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1036.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1037.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1038. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1039. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1040. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1041. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DUSE_LIBPCI=1 $
  1042. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1043.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1044.      -D_UNICODE -DUNICODE -D_DEBUG
  1045.  asmflags =
  1046. diff --git a/Debug_x64/obj/chrome/unit_tests.ninja b/Debug_x64/obj/chrome/unit_tests.ninja
  1047. index d0ff5eb..68d5cd2 100644
  1048. --- a/Debug_x64/obj/chrome/unit_tests.ninja
  1049. +++ b/Debug_x64/obj/chrome/unit_tests.ninja
  1050. @@ -1456,10 +1456,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1051.      -DI18N_PHONENUMBERS_USE_ICU_REGEXP=1 $
  1052.      -DI18N_PHONENUMBERS_NO_THREAD_SAFETY=1 -DWEBRTC_CHROMIUM_BUILD $
  1053.      -DWEBRTC_WIN -DMESA_EGL_NO_X11_HEADERS -DHUNSPELL_STATIC $
  1054. -    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DPERFTOOLS_DLL_DECL= $
  1055. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1056. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1057. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1058. +    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1059. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1060. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1061. +    -D_UNICODE -DUNICODE -D_DEBUG
  1062.  asmflags =
  1063.  rcflags = /I..\.. /Igen /I..\..\chrome /d_DEBUG /l409
  1064.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. -Igen\chrome $
  1065. diff --git a/Debug_x64/obj/components/components_browsertests.ninja b/Debug_x64/obj/components/components_browsertests.ninja
  1066. index 1ca46c7..bd1edf1 100644
  1067. --- a/Debug_x64/obj/components/components_browsertests.ninja
  1068. +++ b/Debug_x64/obj/components/components_browsertests.ninja
  1069. @@ -678,10 +678,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1070.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1071.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1072.      -DUNIT_TEST -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1073. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  1074. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1075. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1076. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1077. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1078. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1079. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1080. +    -D_UNICODE -DUNICODE -D_DEBUG
  1081.  asmflags =
  1082.  rcflags = /I..\.. /Igen /I..\..\components /d_DEBUG /l409
  1083.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1084. diff --git a/Debug_x64/obj/components/components_perftests.ninja b/Debug_x64/obj/components/components_perftests.ninja
  1085. index e91fe34..07f8f93 100644
  1086. --- a/Debug_x64/obj/components/components_perftests.ninja
  1087. +++ b/Debug_x64/obj/components/components_perftests.ninja
  1088. @@ -526,9 +526,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1089.      -DPERF_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1090.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1091.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1092. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1093. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1094. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1095. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  1096. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1097.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1098.      -D_UNICODE -DUNICODE -D_DEBUG
  1099.  asmflags =
  1100. diff --git a/Debug_x64/obj/components/components_unittests.ninja b/Debug_x64/obj/components/components_unittests.ninja
  1101. index 961cd66..20cf883 100644
  1102. --- a/Debug_x64/obj/components/components_unittests.ninja
  1103. +++ b/Debug_x64/obj/components/components_unittests.ninja
  1104. @@ -928,7 +928,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1105.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER $
  1106.      "-DPRECACHE_CONFIG_SETTINGS_URL=\"https://www.gstatic.com/chrome/wifiprefetch/precache_config\"" $
  1107.      "-DPRECACHE_MANIFEST_URL_PREFIX=\"https://www.gstatic.com/chrome/wifiprefetch/hosts/\"" $
  1108. -    -DPERFTOOLS_DLL_DECL= -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1109. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1110.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1111.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1112.      -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1113. diff --git a/Debug_x64/obj/components/test_runner/test_runner.ninja b/Debug_x64/obj/components/test_runner/test_runner.ninja
  1114. index 337b3a8..d060c88 100644
  1115. --- a/Debug_x64/obj/components/test_runner/test_runner.ninja
  1116. +++ b/Debug_x64/obj/components/test_runner/test_runner.ninja
  1117. @@ -45,7 +45,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1118.      -DU_STATIC_IMPLEMENTATION -DGR_GL_FUNCTION_TYPE=__stdcall $
  1119.      -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS $
  1120.      -DSK_IGNORE_GL_TEXTURE_TARGET -DCHROME_PNG_WRITE_SUPPORT $
  1121. -    -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1122. +    -DPNG_USER_CONFIG -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1123.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1124.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1125.      -D_UNICODE -DUNICODE -D_DEBUG
  1126. diff --git a/Debug_x64/obj/content/content_browsertests.ninja b/Debug_x64/obj/content/content_browsertests.ninja
  1127. index 1d3bf11..381fe2f 100644
  1128. --- a/Debug_x64/obj/content/content_browsertests.ninja
  1129. +++ b/Debug_x64/obj/content/content_browsertests.ninja
  1130. @@ -573,10 +573,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1131.      -DSK_IGNORE_GL_TEXTURE_TARGET -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 $
  1132.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1133.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DMESA_EGL_NO_X11_HEADERS $
  1134. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1135. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1136. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1137. -    -D_UNICODE -DUNICODE -D_DEBUG
  1138. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1139. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1140. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1141.  asmflags =
  1142.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  1143.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1144. diff --git a/Debug_x64/obj/content/content_gl_benchmark.ninja b/Debug_x64/obj/content/content_gl_benchmark.ninja
  1145. index a5582af..5692ac1 100644
  1146. --- a/Debug_x64/obj/content/content_gl_benchmark.ninja
  1147. +++ b/Debug_x64/obj/content/content_gl_benchmark.ninja
  1148. @@ -521,8 +521,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1149.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1150.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1151.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1152. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1153. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1154. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1155. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1156.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1157.      -D_UNICODE -DUNICODE -D_DEBUG
  1158.  asmflags =
  1159. diff --git a/Debug_x64/obj/content/content_gl_tests.ninja b/Debug_x64/obj/content/content_gl_tests.ninja
  1160. index b85298b..ce44797 100644
  1161. --- a/Debug_x64/obj/content/content_gl_tests.ninja
  1162. +++ b/Debug_x64/obj/content/content_gl_tests.ninja
  1163. @@ -523,8 +523,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1164.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1165.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1166.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1167. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1168. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1169. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1170. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1171.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1172.      -D_UNICODE -DUNICODE -D_DEBUG
  1173.  asmflags =
  1174. diff --git a/Debug_x64/obj/content/content_perftests.ninja b/Debug_x64/obj/content/content_perftests.ninja
  1175. index 5d7b13c..7b074a2 100644
  1176. --- a/Debug_x64/obj/content/content_perftests.ninja
  1177. +++ b/Debug_x64/obj/content/content_perftests.ninja
  1178. @@ -518,10 +518,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1179.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1180.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1181.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1182. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1183. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1184. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1185. -    -D_UNICODE -DUNICODE -D_DEBUG
  1186. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1187. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1188. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1189.  asmflags =
  1190.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  1191.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1192. diff --git a/Debug_x64/obj/content/content_renderer.ninja b/Debug_x64/obj/content/content_renderer.ninja
  1193. index 2bd6658..f39329e 100644
  1194. --- a/Debug_x64/obj/content/content_renderer.ninja
  1195. +++ b/Debug_x64/obj/content/content_renderer.ninja
  1196. @@ -70,10 +70,10 @@ defines = -DCONTENT_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS $
  1197.      -DU_STATIC_IMPLEMENTATION -DFEATURE_ENABLE_SSL $
  1198.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  1199.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  1200. -    -DWEBRTC_WIN -DXML_STATIC -DPERFTOOLS_DLL_DECL= -DWEBRTC_CHROMIUM_BUILD $
  1201. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1202. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1203. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1204. +    -DWEBRTC_WIN -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  1205. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1206. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1207. +    -D_UNICODE -DUNICODE -D_DEBUG
  1208.  asmflags =
  1209.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  1210.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1211. diff --git a/Debug_x64/obj/content/content_shell.ninja b/Debug_x64/obj/content/content_shell.ninja
  1212. index ec11a84..fef0a2a 100644
  1213. --- a/Debug_x64/obj/content/content_shell.ninja
  1214. +++ b/Debug_x64/obj/content/content_shell.ninja
  1215. @@ -551,7 +551,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1216.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1217.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1218.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  1219. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1220. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1221.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1222.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1223.      -D_UNICODE -DUNICODE -D_DEBUG
  1224. diff --git a/Debug_x64/obj/content/content_shell_lib.ninja b/Debug_x64/obj/content/content_shell_lib.ninja
  1225. index 5dd8248..042ea9a 100644
  1226. --- a/Debug_x64/obj/content/content_shell_lib.ninja
  1227. +++ b/Debug_x64/obj/content/content_shell_lib.ninja
  1228. @@ -74,8 +74,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1229.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1230.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1231.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1232. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1233. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1234. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1235. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1236.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1237.      -D_UNICODE -DUNICODE -D_DEBUG
  1238.  asmflags =
  1239. diff --git a/Debug_x64/obj/content/content_unittests.ninja b/Debug_x64/obj/content/content_unittests.ninja
  1240. index e8944cc..6045f5f 100644
  1241. --- a/Debug_x64/obj/content/content_unittests.ninja
  1242. +++ b/Debug_x64/obj/content/content_unittests.ninja
  1243. @@ -527,10 +527,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1244.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  1245.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  1246.      -DWEBRTC_WIN -DXML_STATIC -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1247. -    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DPERFTOOLS_DLL_DECL= $
  1248. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1249. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1250. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1251. +    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  1252. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1253. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1254. +    -D_UNICODE -DUNICODE -D_DEBUG
  1255.  asmflags =
  1256.  rcflags = /I..\.. /Igen /I..\..\content /d_DEBUG /l409
  1257.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1258. diff --git a/Debug_x64/obj/content/video_decode_accelerator_unittest.ninja b/Debug_x64/obj/content/video_decode_accelerator_unittest.ninja
  1259. index aac680b..3494e70 100644
  1260. --- a/Debug_x64/obj/content/video_decode_accelerator_unittest.ninja
  1261. +++ b/Debug_x64/obj/content/video_decode_accelerator_unittest.ninja
  1262. @@ -489,8 +489,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1263.      -DUNIT_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1264.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1265.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1266. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1267. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1268. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1269. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1270.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1271.      -D_UNICODE -DUNICODE -D_DEBUG
  1272.  asmflags =
  1273. diff --git a/Debug_x64/obj/extensions/extensions_browsertests.ninja b/Debug_x64/obj/extensions/extensions_browsertests.ninja
  1274. index 0d59eee..13d6dca 100644
  1275. --- a/Debug_x64/obj/extensions/extensions_browsertests.ninja
  1276. +++ b/Debug_x64/obj/extensions/extensions_browsertests.ninja
  1277. @@ -733,9 +733,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1278.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1279.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1280.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1281. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1282. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1283. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1284. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  1285. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1286.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1287.      -D_UNICODE -DUNICODE -D_DEBUG
  1288.  asmflags =
  1289. diff --git a/Debug_x64/obj/extensions/extensions_unittests.ninja b/Debug_x64/obj/extensions/extensions_unittests.ninja
  1290. index d151cf2..50aaeb3 100644
  1291. --- a/Debug_x64/obj/extensions/extensions_unittests.ninja
  1292. +++ b/Debug_x64/obj/extensions/extensions_unittests.ninja
  1293. @@ -593,10 +593,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1294.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1295.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1296.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1297. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  1298. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1299. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1300. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1301. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1302. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1303. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1304. +    -D_UNICODE -DUNICODE -D_DEBUG
  1305.  asmflags =
  1306.  rcflags = /I..\.. /Igen /I..\..\extensions /d_DEBUG /l409
  1307.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1308. diff --git a/Debug_x64/obj/extensions/shell/app_shell.ninja b/Debug_x64/obj/extensions/shell/app_shell.ninja
  1309. index c541a33..bcf2f98 100644
  1310. --- a/Debug_x64/obj/extensions/shell/app_shell.ninja
  1311. +++ b/Debug_x64/obj/extensions/shell/app_shell.ninja
  1312. @@ -716,10 +716,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1313.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  1314.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1315.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1316. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1317. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1318. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1319. -    -D_UNICODE -DUNICODE -D_DEBUG
  1320. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1321. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1322. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1323.  asmflags =
  1324.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /d_DEBUG /l409
  1325.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1326. diff --git a/Debug_x64/obj/extensions/shell/app_shell_unittests.ninja b/Debug_x64/obj/extensions/shell/app_shell_unittests.ninja
  1327. index 1f31ab7..342d268 100644
  1328. --- a/Debug_x64/obj/extensions/shell/app_shell_unittests.ninja
  1329. +++ b/Debug_x64/obj/extensions/shell/app_shell_unittests.ninja
  1330. @@ -720,9 +720,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1331.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1332.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1333.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1334. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1335. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1336. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1337. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  1338. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1339.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1340.      -D_UNICODE -DUNICODE -D_DEBUG
  1341.  asmflags =
  1342. diff --git a/Debug_x64/obj/media/media_unittests.ninja b/Debug_x64/obj/media/media_unittests.ninja
  1343. index 3df047d..e2f8b87 100644
  1344. --- a/Debug_x64/obj/media/media_unittests.ninja
  1345. +++ b/Debug_x64/obj/media/media_unittests.ninja
  1346. @@ -106,10 +106,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1347.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1348.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1349.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1350. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1351. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1352. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1353. -    -D_UNICODE -DUNICODE -D_DEBUG
  1354. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1355. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1356. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1357.  asmflags =
  1358.  rcflags = /I..\.. /Igen /I..\..\media /d_DEBUG /l409
  1359.  includes = -Igen -I..\..\third_party\wtl\include $
  1360. diff --git a/Debug_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja b/Debug_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  1361. index 4c91e6b..dc67e1d 100644
  1362. --- a/Debug_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  1363. +++ b/Debug_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  1364. @@ -531,10 +531,10 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1365.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1366.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1367.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1368. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  1369. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1370. -    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1371. -    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1372. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  1373. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1374. +    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1375. +    -D_UNICODE -DUNICODE -D_DEBUG
  1376.  asmflags =
  1377.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\platform /d_DEBUG $
  1378.      /l409
  1379. diff --git a/Debug_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja b/Debug_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  1380. index 5f9e39b..2e28608 100644
  1381. --- a/Debug_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  1382. +++ b/Debug_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  1383. @@ -538,10 +538,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1384.      -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 $
  1385.      -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_WEB_AUDIO=1 $
  1386.      -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 $
  1387. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1388. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1389. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1390. -    -D_UNICODE -DUNICODE -D_DEBUG
  1391. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1392. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1393. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1394.  asmflags =
  1395.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\web /d_DEBUG /l409
  1396.  includes = -Igen -I..\..\third_party\wtl\include $
  1397. diff --git a/Debug_x64/obj/ui/app_list/app_list_demo.ninja b/Debug_x64/obj/ui/app_list/app_list_demo.ninja
  1398. index 090aa11..075d50a 100644
  1399. --- a/Debug_x64/obj/ui/app_list/app_list_demo.ninja
  1400. +++ b/Debug_x64/obj/ui/app_list/app_list_demo.ninja
  1401. @@ -564,10 +564,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1402.      -DGTEST_LANG_CXX11=0 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1403.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1404.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1405. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1406. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1407. -    -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1408. -    -D_UNICODE -DUNICODE -D_DEBUG
  1409. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1410. +    -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
  1411. +    -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
  1412.  asmflags =
  1413.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /d_DEBUG /l409
  1414.  includes = -Igen -I..\..\third_party\wtl\include $
  1415. diff --git a/Debug_x64/obj/ui/app_list/app_list_unittests.ninja b/Debug_x64/obj/ui/app_list/app_list_unittests.ninja
  1416. index 2d5ee68..a86b41a 100644
  1417. --- a/Debug_x64/obj/ui/app_list/app_list_unittests.ninja
  1418. +++ b/Debug_x64/obj/ui/app_list/app_list_unittests.ninja
  1419. @@ -165,8 +165,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1420.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1421.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1422.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1423. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1424. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1425. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1426. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1427.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1428.      -D_UNICODE -DUNICODE -D_DEBUG
  1429.  asmflags =
  1430. diff --git a/Debug_x64/obj/ui/keyboard/keyboard_unittests.ninja b/Debug_x64/obj/ui/keyboard/keyboard_unittests.ninja
  1431. index 20235f0..6f34c40 100644
  1432. --- a/Debug_x64/obj/ui/keyboard/keyboard_unittests.ninja
  1433. +++ b/Debug_x64/obj/ui/keyboard/keyboard_unittests.ninja
  1434. @@ -146,8 +146,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1435.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1436.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1437.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1438. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1439. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1440. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1441. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1442.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1443.      -D_UNICODE -DUNICODE -D_DEBUG
  1444.  asmflags =
  1445. diff --git a/Debug_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja b/Debug_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  1446. index 94868e7..193b911 100644
  1447. --- a/Debug_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  1448. +++ b/Debug_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  1449. @@ -562,7 +562,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1450.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1451.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1452.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  1453. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1454. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1455.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1456.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1457.      -D_UNICODE -DUNICODE -D_DEBUG
  1458. diff --git a/Debug_x64/obj/ui/views/views_unittests.ninja b/Debug_x64/obj/ui/views/views_unittests.ninja
  1459. index 8e4f474..0a9dcea 100644
  1460. --- a/Debug_x64/obj/ui/views/views_unittests.ninja
  1461. +++ b/Debug_x64/obj/ui/views/views_unittests.ninja
  1462. @@ -161,8 +161,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1463.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1464.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1465.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1466. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1467. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1468. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1469. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1470.      -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
  1471.      -D_UNICODE -DUNICODE -D_DEBUG
  1472.  asmflags =
  1473. diff --git a/Release/obj/ash/ash_shell_with_content.ninja b/Release/obj/ash/ash_shell_with_content.ninja
  1474. index aaed15a..9ad852b 100644
  1475. --- a/Release/obj/ash/ash_shell_with_content.ninja
  1476. +++ b/Release/obj/ash/ash_shell_with_content.ninja
  1477. @@ -608,9 +608,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1478.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1479.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1480.      -DTOOLKIT_VIEWS=1 -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 $
  1481. -    -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1482. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1483. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1484. +    -DGTEST_LANG_CXX11=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1485. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1486. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1487.  asmflags =
  1488.  rcflags = /I..\.. /Igen /I..\..\ash /l409
  1489.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1490. diff --git a/Release/obj/ash/ash_unittests.ninja b/Release/obj/ash/ash_unittests.ninja
  1491. index 6f138e4..d54583d 100644
  1492. --- a/Release/obj/ash/ash_unittests.ninja
  1493. +++ b/Release/obj/ash/ash_unittests.ninja
  1494. @@ -583,9 +583,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1495.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1496.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1497.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1498. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1499. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1500. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1501. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1502. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1503. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1504.  asmflags =
  1505.  rcflags = /I..\.. /Igen /I..\..\ash /l409
  1506.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1507. diff --git a/Release/obj/base/allocator/allocator.ninja b/Release/obj/base/allocator/allocator.ninja
  1508. index 7589633..0ee7865 100644
  1509. --- a/Release/obj/base/allocator/allocator.ninja
  1510. +++ b/Release/obj/base/allocator/allocator.ninja
  1511. @@ -34,8 +34,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1512.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1513.  asmflags =
  1514.  rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
  1515. -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  1516. -    -I..\..
  1517. +includes = -Igen -I..\..\third_party\wtl\include -I..\..
  1518.  midl_includes =
  1519.  cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
  1520.      /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
  1521. diff --git a/Release/obj/base/allocator/allocator_unittests.ninja b/Release/obj/base/allocator/allocator_unittests.ninja
  1522. index cbe3555..0256267 100644
  1523. --- a/Release/obj/base/allocator/allocator_unittests.ninja
  1524. +++ b/Release/obj/base/allocator/allocator_unittests.ninja
  1525. @@ -7,8 +7,7 @@ asm = $ml_x86
  1526.  build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
  1527.      obj\base\allocator\allocator.lib $
  1528.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  1529. -    gen\allocator\libcmt.lib $
  1530. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
  1531. +    gen\allocator\libcmt.lib
  1532.  
  1533.  build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
  1534.      gen\allocator\libcmt.lib gen\allocator\libcmt.lib
  1535. @@ -38,10 +37,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1536.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  1537.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1538.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1539. -    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= $
  1540. -    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  1541. -    -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
  1542. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1543. +    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DUSE_LIBPCI=1 $
  1544. +    -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  1545. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1546.  asmflags =
  1547.  rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
  1548.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  1549. @@ -88,7 +86,7 @@ build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
  1550.      obj\base\allocator\allocator_unittests.allocator_unittest.obj $
  1551.      obj\base\allocator\allocator.lib $
  1552.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  1553. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
  1554. +    | $
  1555.      obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
  1556.      ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
  1557.    binary = allocator_unittests.exe
  1558. diff --git a/Release/obj/base/base_unittests.ninja b/Release/obj/base/base_unittests.ninja
  1559. index bac0a7a..0016a52 100644
  1560. --- a/Release/obj/base/base_unittests.ninja
  1561. +++ b/Release/obj/base/base_unittests.ninja
  1562. @@ -52,8 +52,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1563.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1564.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST $
  1565.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1566. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1567. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1568. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1569. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1570.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1571.  asmflags =
  1572.  rcflags = /I..\.. /Igen /I..\..\base /l409
  1573. diff --git a/Release/obj/build/All.ninja b/Release/obj/build/All.ninja
  1574. index 61ee136..7790aad 100644
  1575. --- a/Release/obj/build/All.ninja
  1576. +++ b/Release/obj/build/All.ninja
  1577. @@ -1146,10 +1146,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1578.      "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", $
  1579.      \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" -DGL_APICALL= $
  1580.      -DEGLAPI= -DANGLE_ENABLE_D3D9 -DANGLE_ENABLE_D3D11 $
  1581. -    -DANGLE_ENABLE_OPENGL -DPERFTOOLS_DLL_DECL= -DOPENSSL_SMALL $
  1582. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  1583. -    -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
  1584. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1585. +    -DANGLE_ENABLE_OPENGL -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1586. +    -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
  1587. +    -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1588.  asmflags =
  1589.  rcflags = /I..\.. /Igen /I..\..\build /l409
  1590.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1591. diff --git a/Release/obj/chrome/browser_tests.ninja b/Release/obj/chrome/browser_tests.ninja
  1592. index 18e7c02..70e1632 100644
  1593. --- a/Release/obj/chrome/browser_tests.ninja
  1594. +++ b/Release/obj/chrome/browser_tests.ninja
  1595. @@ -2175,8 +2175,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1596.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1597.      "-DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"" $
  1598.      -DI18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1 -DWEBRTC_CHROMIUM_BUILD $
  1599. -    -DWEBRTC_WIN -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1600. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1601. +    -DWEBRTC_WIN -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1602. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1603.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1604.  asmflags =
  1605.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1606. diff --git a/Release/obj/chrome/chrome_app_unittests.ninja b/Release/obj/chrome/chrome_app_unittests.ninja
  1607. index 123df91..58f8efa 100644
  1608. --- a/Release/obj/chrome/chrome_app_unittests.ninja
  1609. +++ b/Release/obj/chrome/chrome_app_unittests.ninja
  1610. @@ -1181,10 +1181,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1611.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1612.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1613.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1614. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  1615. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1616. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1617. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1618. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  1619. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1620. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1621.  asmflags =
  1622.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1623.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1624. diff --git a/Release/obj/chrome/chrome_child_dll.ninja b/Release/obj/chrome/chrome_child_dll.ninja
  1625. index c1e1c06..2d8932a 100644
  1626. --- a/Release/obj/chrome/chrome_child_dll.ninja
  1627. +++ b/Release/obj/chrome/chrome_child_dll.ninja
  1628. @@ -815,9 +815,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1629.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1630.      -DCHROME_MULTIPLE_DLL_CHILD -DMOJO_USE_SYSTEM_IMPL -DTOOLKIT_VIEWS=1 $
  1631.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1632. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  1633. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1634. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1635. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1636. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1637.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1638.  asmflags =
  1639.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1640. diff --git a/Release/obj/chrome/chrome_main_dll.ninja b/Release/obj/chrome/chrome_main_dll.ninja
  1641. index 9674541..7971209 100644
  1642. --- a/Release/obj/chrome/chrome_main_dll.ninja
  1643. +++ b/Release/obj/chrome/chrome_main_dll.ninja
  1644. @@ -971,9 +971,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1645.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1646.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1647.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1648. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  1649. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1650. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1651. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1652. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1653.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1654.  asmflags =
  1655.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1656. diff --git a/Release/obj/chrome/interactive_ui_tests.ninja b/Release/obj/chrome/interactive_ui_tests.ninja
  1657. index 0a8c964..013a47e 100644
  1658. --- a/Release/obj/chrome/interactive_ui_tests.ninja
  1659. +++ b/Release/obj/chrome/interactive_ui_tests.ninja
  1660. @@ -1196,10 +1196,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1661.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DHUNSPELL_STATIC $
  1662.      -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DU_USING_ICU_NAMESPACE=0 $
  1663.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1664. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  1665. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1666. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1667. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1668. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  1669. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1670. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1671.  asmflags =
  1672.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1673.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1674. diff --git a/Release/obj/chrome/performance_browser_tests.ninja b/Release/obj/chrome/performance_browser_tests.ninja
  1675. index 19b97be..3075e78 100644
  1676. --- a/Release/obj/chrome/performance_browser_tests.ninja
  1677. +++ b/Release/obj/chrome/performance_browser_tests.ninja
  1678. @@ -1204,8 +1204,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1679.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1680.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1681.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1682. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1683. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1684. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1685. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1686.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1687.  asmflags =
  1688.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1689. diff --git a/Release/obj/chrome/setup.ninja b/Release/obj/chrome/setup.ninja
  1690. index 17827eb..e51731e 100644
  1691. --- a/Release/obj/chrome/setup.ninja
  1692. +++ b/Release/obj/chrome/setup.ninja
  1693. @@ -110,9 +110,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1694.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  1695.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1696.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1697. -    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DPERFTOOLS_DLL_DECL= $
  1698. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1699. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1700. +    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1701. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1702.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1703.  asmflags =
  1704.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1705. diff --git a/Release/obj/chrome/setup_unittests.ninja b/Release/obj/chrome/setup_unittests.ninja
  1706. index f0743ba..8b0bf03 100644
  1707. --- a/Release/obj/chrome/setup_unittests.ninja
  1708. +++ b/Release/obj/chrome/setup_unittests.ninja
  1709. @@ -80,8 +80,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1710.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1711.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DU_USING_ICU_NAMESPACE=0 $
  1712.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DUNIT_TEST $
  1713. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1714. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1715. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1716. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1717.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1718.  asmflags =
  1719.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1720. diff --git a/Release/obj/chrome/sync_integration_tests.ninja b/Release/obj/chrome/sync_integration_tests.ninja
  1721. index 81d1914..e5f0e5e 100644
  1722. --- a/Release/obj/chrome/sync_integration_tests.ninja
  1723. +++ b/Release/obj/chrome/sync_integration_tests.ninja
  1724. @@ -1193,10 +1193,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1725.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1726.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1727.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1728. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  1729. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1730. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1731. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1732. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  1733. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1734. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1735.  asmflags =
  1736.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1737.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1738. diff --git a/Release/obj/chrome/sync_performance_tests.ninja b/Release/obj/chrome/sync_performance_tests.ninja
  1739. index a5daf58..211cb95 100644
  1740. --- a/Release/obj/chrome/sync_performance_tests.ninja
  1741. +++ b/Release/obj/chrome/sync_performance_tests.ninja
  1742. @@ -1187,10 +1187,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1743.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1744.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1745.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1746. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  1747. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1748. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1749. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1750. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DUSE_LIBPCI=1 $
  1751. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1752. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1753.  asmflags =
  1754.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1755.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1756. diff --git a/Release/obj/chrome/unit_tests.ninja b/Release/obj/chrome/unit_tests.ninja
  1757. index 31930d2..4c83b41 100644
  1758. --- a/Release/obj/chrome/unit_tests.ninja
  1759. +++ b/Release/obj/chrome/unit_tests.ninja
  1760. @@ -1456,9 +1456,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1761.      -DI18N_PHONENUMBERS_USE_ICU_REGEXP=1 $
  1762.      -DI18N_PHONENUMBERS_NO_THREAD_SAFETY=1 -DWEBRTC_CHROMIUM_BUILD $
  1763.      -DWEBRTC_WIN -DMESA_EGL_NO_X11_HEADERS -DHUNSPELL_STATIC $
  1764. -    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DPERFTOOLS_DLL_DECL= $
  1765. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1766. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1767. +    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1768. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1769.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1770.  asmflags =
  1771.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  1772. diff --git a/Release/obj/components/components_browsertests.ninja b/Release/obj/components/components_browsertests.ninja
  1773. index d0497bc..2bd4e17 100644
  1774. --- a/Release/obj/components/components_browsertests.ninja
  1775. +++ b/Release/obj/components/components_browsertests.ninja
  1776. @@ -678,9 +678,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1777.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1778.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1779.      -DUNIT_TEST -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  1780. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  1781. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1782. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1783. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1784. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1785.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1786.  asmflags =
  1787.  rcflags = /I..\.. /Igen /I..\..\components /l409
  1788. diff --git a/Release/obj/components/components_perftests.ninja b/Release/obj/components/components_perftests.ninja
  1789. index b1f9a81..49d5365 100644
  1790. --- a/Release/obj/components/components_perftests.ninja
  1791. +++ b/Release/obj/components/components_perftests.ninja
  1792. @@ -526,10 +526,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1793.      -DPERF_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1794.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1795.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1796. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1797. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1798. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1799. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1800. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  1801. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1802. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1803.  asmflags =
  1804.  rcflags = /I..\.. /Igen /I..\..\components /l409
  1805.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1806. diff --git a/Release/obj/components/components_unittests.ninja b/Release/obj/components/components_unittests.ninja
  1807. index 1f0cb85..7568384 100644
  1808. --- a/Release/obj/components/components_unittests.ninja
  1809. +++ b/Release/obj/components/components_unittests.ninja
  1810. @@ -928,7 +928,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1811.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER $
  1812.      "-DPRECACHE_CONFIG_SETTINGS_URL=\"https://www.gstatic.com/chrome/wifiprefetch/precache_config\"" $
  1813.      "-DPRECACHE_MANIFEST_URL_PREFIX=\"https://www.gstatic.com/chrome/wifiprefetch/hosts/\"" $
  1814. -    -DPERFTOOLS_DLL_DECL= -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1815. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1816.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1817.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1818.      -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1819. diff --git a/Release/obj/components/test_runner/test_runner.ninja b/Release/obj/components/test_runner/test_runner.ninja
  1820. index 4771b67..68ab4e5 100644
  1821. --- a/Release/obj/components/test_runner/test_runner.ninja
  1822. +++ b/Release/obj/components/test_runner/test_runner.ninja
  1823. @@ -45,7 +45,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1824.      -DU_STATIC_IMPLEMENTATION -DGR_GL_FUNCTION_TYPE=__stdcall $
  1825.      -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS $
  1826.      -DSK_IGNORE_GL_TEXTURE_TARGET -DCHROME_PNG_WRITE_SUPPORT $
  1827. -    -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1828. +    -DPNG_USER_CONFIG -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1829.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1830.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1831.  asmflags =
  1832. diff --git a/Release/obj/content/content_browsertests.ninja b/Release/obj/content/content_browsertests.ninja
  1833. index 2e53f95..9d8aad5 100644
  1834. --- a/Release/obj/content/content_browsertests.ninja
  1835. +++ b/Release/obj/content/content_browsertests.ninja
  1836. @@ -573,8 +573,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1837.      -DSK_IGNORE_GL_TEXTURE_TARGET -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 $
  1838.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1839.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DMESA_EGL_NO_X11_HEADERS $
  1840. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1841. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1842. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1843. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1844.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1845.  asmflags =
  1846.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1847. diff --git a/Release/obj/content/content_gl_benchmark.ninja b/Release/obj/content/content_gl_benchmark.ninja
  1848. index bf11379..342b597 100644
  1849. --- a/Release/obj/content/content_gl_benchmark.ninja
  1850. +++ b/Release/obj/content/content_gl_benchmark.ninja
  1851. @@ -521,9 +521,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1852.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1853.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1854.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1855. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1856. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1857. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1858. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1859. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1860. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1861.  asmflags =
  1862.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1863.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1864. diff --git a/Release/obj/content/content_gl_tests.ninja b/Release/obj/content/content_gl_tests.ninja
  1865. index 7b4aca5..52c3983 100644
  1866. --- a/Release/obj/content/content_gl_tests.ninja
  1867. +++ b/Release/obj/content/content_gl_tests.ninja
  1868. @@ -523,9 +523,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1869.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1870.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  1871.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1872. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1873. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1874. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1875. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1876. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1877. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1878.  asmflags =
  1879.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1880.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1881. diff --git a/Release/obj/content/content_perftests.ninja b/Release/obj/content/content_perftests.ninja
  1882. index 3dd2493..e5f924f 100644
  1883. --- a/Release/obj/content/content_perftests.ninja
  1884. +++ b/Release/obj/content/content_perftests.ninja
  1885. @@ -518,8 +518,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1886.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1887.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1888.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1889. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1890. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1891. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1892. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1893.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1894.  asmflags =
  1895.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1896. diff --git a/Release/obj/content/content_renderer.ninja b/Release/obj/content/content_renderer.ninja
  1897. index c53e7a8..f936be3 100644
  1898. --- a/Release/obj/content/content_renderer.ninja
  1899. +++ b/Release/obj/content/content_renderer.ninja
  1900. @@ -70,10 +70,9 @@ defines = -DCONTENT_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS $
  1901.      -DU_STATIC_IMPLEMENTATION -DFEATURE_ENABLE_SSL $
  1902.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  1903.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  1904. -    -DWEBRTC_WIN -DXML_STATIC -DPERFTOOLS_DLL_DECL= -DWEBRTC_CHROMIUM_BUILD $
  1905. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1906. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1907. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1908. +    -DWEBRTC_WIN -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  1909. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1910. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1911.  asmflags =
  1912.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1913.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1914. diff --git a/Release/obj/content/content_shell.ninja b/Release/obj/content/content_shell.ninja
  1915. index 5c581b6..c461601 100644
  1916. --- a/Release/obj/content/content_shell.ninja
  1917. +++ b/Release/obj/content/content_shell.ninja
  1918. @@ -551,7 +551,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1919.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  1920.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  1921.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  1922. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1923. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1924.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1925.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1926.  asmflags =
  1927. diff --git a/Release/obj/content/content_shell_lib.ninja b/Release/obj/content/content_shell_lib.ninja
  1928. index 096b177..2dec475 100644
  1929. --- a/Release/obj/content/content_shell_lib.ninja
  1930. +++ b/Release/obj/content/content_shell_lib.ninja
  1931. @@ -74,9 +74,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1932.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1933.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1934.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1935. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1936. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1937. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1938. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1939. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1940. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1941.  asmflags =
  1942.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1943.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1944. diff --git a/Release/obj/content/content_unittests.ninja b/Release/obj/content/content_unittests.ninja
  1945. index 91244d5..0d70cca 100644
  1946. --- a/Release/obj/content/content_unittests.ninja
  1947. +++ b/Release/obj/content/content_unittests.ninja
  1948. @@ -527,10 +527,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1949.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  1950.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  1951.      -DWEBRTC_WIN -DXML_STATIC -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  1952. -    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DPERFTOOLS_DLL_DECL= $
  1953. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  1954. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1955. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1956. +    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  1957. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1958. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1959.  asmflags =
  1960.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1961.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  1962. diff --git a/Release/obj/content/video_decode_accelerator_unittest.ninja b/Release/obj/content/video_decode_accelerator_unittest.ninja
  1963. index fd2fa2b..ce65f56 100644
  1964. --- a/Release/obj/content/video_decode_accelerator_unittest.ninja
  1965. +++ b/Release/obj/content/video_decode_accelerator_unittest.ninja
  1966. @@ -489,9 +489,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1967.      -DUNIT_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1968.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1969.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1970. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  1971. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1972. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1973. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1974. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1975. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1976.  asmflags =
  1977.  rcflags = /I..\.. /Igen /I..\..\content /l409
  1978.  includes = -Igen -I..\..\third_party\wtl\include $
  1979. diff --git a/Release/obj/extensions/extensions_browsertests.ninja b/Release/obj/extensions/extensions_browsertests.ninja
  1980. index 2368888..bda081d 100644
  1981. --- a/Release/obj/extensions/extensions_browsertests.ninja
  1982. +++ b/Release/obj/extensions/extensions_browsertests.ninja
  1983. @@ -733,10 +733,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  1984.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  1985.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  1986.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  1987. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  1988. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  1989. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  1990. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1991. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  1992. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  1993. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  1994.  asmflags =
  1995.  rcflags = /I..\.. /Igen /I..\..\extensions /l409
  1996.  includes = -Igen -I..\..\third_party\wtl\include $
  1997. diff --git a/Release/obj/extensions/extensions_unittests.ninja b/Release/obj/extensions/extensions_unittests.ninja
  1998. index 25e9cd6..ac2e5fd 100644
  1999. --- a/Release/obj/extensions/extensions_unittests.ninja
  2000. +++ b/Release/obj/extensions/extensions_unittests.ninja
  2001. @@ -593,9 +593,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2002.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2003.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2004.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2005. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  2006. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2007. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2008. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2009. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2010.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2011.  asmflags =
  2012.  rcflags = /I..\.. /Igen /I..\..\extensions /l409
  2013. diff --git a/Release/obj/extensions/shell/app_shell.ninja b/Release/obj/extensions/shell/app_shell.ninja
  2014. index e484e4a..9bf829b 100644
  2015. --- a/Release/obj/extensions/shell/app_shell.ninja
  2016. +++ b/Release/obj/extensions/shell/app_shell.ninja
  2017. @@ -716,8 +716,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2018.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  2019.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2020.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2021. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2022. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2023. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2024. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2025.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2026.  asmflags =
  2027.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /l409
  2028. diff --git a/Release/obj/extensions/shell/app_shell_unittests.ninja b/Release/obj/extensions/shell/app_shell_unittests.ninja
  2029. index 5182ac0..3205d72 100644
  2030. --- a/Release/obj/extensions/shell/app_shell_unittests.ninja
  2031. +++ b/Release/obj/extensions/shell/app_shell_unittests.ninja
  2032. @@ -720,10 +720,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2033.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2034.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2035.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2036. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2037. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2038. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2039. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2040. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  2041. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2042. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2043.  asmflags =
  2044.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /l409
  2045.  includes = -Igen -I..\..\third_party\wtl\include $
  2046. diff --git a/Release/obj/media/media_unittests.ninja b/Release/obj/media/media_unittests.ninja
  2047. index 55a55fa..d44ef98 100644
  2048. --- a/Release/obj/media/media_unittests.ninja
  2049. +++ b/Release/obj/media/media_unittests.ninja
  2050. @@ -106,8 +106,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2051.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2052.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2053.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2054. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2055. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2056. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2057. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2058.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2059.  asmflags =
  2060.  rcflags = /I..\.. /Igen /I..\..\media /l409
  2061. diff --git a/Release/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja b/Release/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2062. index 763a507..32bfe3a 100644
  2063. --- a/Release/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2064. +++ b/Release/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2065. @@ -531,10 +531,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2066.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2067.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2068.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2069. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  2070. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2071. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2072. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2073. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  2074. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2075. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2076.  asmflags =
  2077.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\platform /l409
  2078.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2079. diff --git a/Release/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja b/Release/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2080. index 1482eaa..96df446 100644
  2081. --- a/Release/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2082. +++ b/Release/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2083. @@ -538,8 +538,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2084.      -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 $
  2085.      -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_WEB_AUDIO=1 $
  2086.      -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 $
  2087. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2088. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2089. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2090. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2091.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2092.  asmflags =
  2093.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\web /l409
  2094. diff --git a/Release/obj/ui/app_list/app_list_demo.ninja b/Release/obj/ui/app_list/app_list_demo.ninja
  2095. index 57fff0b..5f90429 100644
  2096. --- a/Release/obj/ui/app_list/app_list_demo.ninja
  2097. +++ b/Release/obj/ui/app_list/app_list_demo.ninja
  2098. @@ -564,8 +564,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2099.      -DGTEST_LANG_CXX11=0 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2100.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2101.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2102. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2103. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2104. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2105. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2106.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2107.  asmflags =
  2108.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /l409
  2109. diff --git a/Release/obj/ui/app_list/app_list_unittests.ninja b/Release/obj/ui/app_list/app_list_unittests.ninja
  2110. index bc6b3f3..f90926d 100644
  2111. --- a/Release/obj/ui/app_list/app_list_unittests.ninja
  2112. +++ b/Release/obj/ui/app_list/app_list_unittests.ninja
  2113. @@ -165,9 +165,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2114.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2115.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2116.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2117. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2118. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2119. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2120. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2121. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2122. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2123.  asmflags =
  2124.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /l409
  2125.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2126. diff --git a/Release/obj/ui/keyboard/keyboard_unittests.ninja b/Release/obj/ui/keyboard/keyboard_unittests.ninja
  2127. index 3748c0d..e78fec2 100644
  2128. --- a/Release/obj/ui/keyboard/keyboard_unittests.ninja
  2129. +++ b/Release/obj/ui/keyboard/keyboard_unittests.ninja
  2130. @@ -146,9 +146,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2131.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2132.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2133.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2134. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2135. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2136. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2137. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2138. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2139. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2140.  asmflags =
  2141.  rcflags = /I..\.. /Igen /I..\..\ui\keyboard /l409
  2142.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2143. diff --git a/Release/obj/ui/views/examples/views_examples_with_content_exe.ninja b/Release/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2144. index 1817fbb..c21478f 100644
  2145. --- a/Release/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2146. +++ b/Release/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2147. @@ -562,7 +562,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2148.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2149.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2150.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  2151. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2152. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2153.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2154.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2155.  asmflags =
  2156. diff --git a/Release/obj/ui/views/views_unittests.ninja b/Release/obj/ui/views/views_unittests.ninja
  2157. index 0c993a9..3ddc9c1 100644
  2158. --- a/Release/obj/ui/views/views_unittests.ninja
  2159. +++ b/Release/obj/ui/views/views_unittests.ninja
  2160. @@ -161,9 +161,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2161.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2162.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2163.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2164. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2165. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2166. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2167. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2168. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2169. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2170.  asmflags =
  2171.  rcflags = /I..\.. /Igen /I..\..\ui\views /l409
  2172.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\ui $
  2173. diff --git a/Release_x64/obj/ash/ash_shell_with_content.ninja b/Release_x64/obj/ash/ash_shell_with_content.ninja
  2174. index 9907660..550a5c7 100644
  2175. --- a/Release_x64/obj/ash/ash_shell_with_content.ninja
  2176. +++ b/Release_x64/obj/ash/ash_shell_with_content.ninja
  2177. @@ -608,9 +608,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2178.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2179.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2180.      -DTOOLKIT_VIEWS=1 -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 $
  2181. -    -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2182. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2183. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2184. +    -DGTEST_LANG_CXX11=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2185. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2186. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2187.  asmflags =
  2188.  rcflags = /I..\.. /Igen /I..\..\ash /l409
  2189.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2190. diff --git a/Release_x64/obj/ash/ash_unittests.ninja b/Release_x64/obj/ash/ash_unittests.ninja
  2191. index cbe3766..0ae860f 100644
  2192. --- a/Release_x64/obj/ash/ash_unittests.ninja
  2193. +++ b/Release_x64/obj/ash/ash_unittests.ninja
  2194. @@ -583,9 +583,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2195.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2196.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2197.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2198. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2199. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2200. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2201. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2202. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2203. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2204.  asmflags =
  2205.  rcflags = /I..\.. /Igen /I..\..\ash /l409
  2206.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2207. diff --git a/Release_x64/obj/base/allocator/allocator.ninja b/Release_x64/obj/base/allocator/allocator.ninja
  2208. index 0e982e4..17cd23b 100644
  2209. --- a/Release_x64/obj/base/allocator/allocator.ninja
  2210. +++ b/Release_x64/obj/base/allocator/allocator.ninja
  2211. @@ -34,8 +34,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2212.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2213.  asmflags =
  2214.  rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
  2215. -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  2216. -    -I..\..
  2217. +includes = -Igen -I..\..\third_party\wtl\include -I..\..
  2218.  midl_includes =
  2219.  cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
  2220.      /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
  2221. diff --git a/Release_x64/obj/base/allocator/allocator_unittests.ninja b/Release_x64/obj/base/allocator/allocator_unittests.ninja
  2222. index e829b1c..681eac4 100644
  2223. --- a/Release_x64/obj/base/allocator/allocator_unittests.ninja
  2224. +++ b/Release_x64/obj/base/allocator/allocator_unittests.ninja
  2225. @@ -7,8 +7,7 @@ asm = $ml_x64
  2226.  build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
  2227.      obj\base\allocator\allocator.lib $
  2228.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  2229. -    gen\allocator\libcmt.lib $
  2230. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
  2231. +    gen\allocator\libcmt.lib
  2232.  
  2233.  build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
  2234.      gen\allocator\libcmt.lib gen\allocator\libcmt.lib
  2235. @@ -38,10 +37,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2236.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  2237.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2238.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2239. -    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DPERFTOOLS_DLL_DECL= $
  2240. -    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  2241. -    -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
  2242. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2243. +    -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DUSE_LIBPCI=1 $
  2244. +    -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
  2245. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2246.  asmflags =
  2247.  rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
  2248.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
  2249. @@ -89,7 +87,7 @@ build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
  2250.      obj\base\allocator\allocator_unittests.allocator_unittest.obj $
  2251.      obj\base\allocator\allocator.lib $
  2252.      obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
  2253. -    obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
  2254. +    | $
  2255.      obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
  2256.      ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
  2257.    binary = allocator_unittests.exe
  2258. diff --git a/Release_x64/obj/base/base_unittests.ninja b/Release_x64/obj/base/base_unittests.ninja
  2259. index 20414af..3ae7dfd 100644
  2260. --- a/Release_x64/obj/base/base_unittests.ninja
  2261. +++ b/Release_x64/obj/base/base_unittests.ninja
  2262. @@ -52,8 +52,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2263.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2264.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST $
  2265.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2266. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2267. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2268. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2269. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2270.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2271.  asmflags =
  2272.  rcflags = /I..\.. /Igen /I..\..\base /l409
  2273. diff --git a/Release_x64/obj/build/All.ninja b/Release_x64/obj/build/All.ninja
  2274. index a47ee02..036ae41 100644
  2275. --- a/Release_x64/obj/build/All.ninja
  2276. +++ b/Release_x64/obj/build/All.ninja
  2277. @@ -1146,10 +1146,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2278.      "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", $
  2279.      \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" -DGL_APICALL= $
  2280.      -DEGLAPI= -DANGLE_ENABLE_D3D9 -DANGLE_ENABLE_D3D11 $
  2281. -    -DANGLE_ENABLE_OPENGL -DPERFTOOLS_DLL_DECL= -DOPENSSL_SMALL $
  2282. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
  2283. -    -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
  2284. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2285. +    -DANGLE_ENABLE_OPENGL -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2286. +    -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
  2287. +    -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2288.  asmflags =
  2289.  rcflags = /I..\.. /Igen /I..\..\build /l409
  2290.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2291. diff --git a/Release_x64/obj/chrome/browser_tests.ninja b/Release_x64/obj/chrome/browser_tests.ninja
  2292. index 79b2193..b749168 100644
  2293. --- a/Release_x64/obj/chrome/browser_tests.ninja
  2294. +++ b/Release_x64/obj/chrome/browser_tests.ninja
  2295. @@ -2176,8 +2176,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2296.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2297.      "-DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://i18napis.appspot.com/ssl-aggregate-address/\"" $
  2298.      -DI18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1 -DWEBRTC_CHROMIUM_BUILD $
  2299. -    -DWEBRTC_WIN -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2300. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2301. +    -DWEBRTC_WIN -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2302. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2303.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2304.  asmflags =
  2305.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2306. diff --git a/Release_x64/obj/chrome/chrome_app_unittests.ninja b/Release_x64/obj/chrome/chrome_app_unittests.ninja
  2307. index 2373bf1..8e3781e 100644
  2308. --- a/Release_x64/obj/chrome/chrome_app_unittests.ninja
  2309. +++ b/Release_x64/obj/chrome/chrome_app_unittests.ninja
  2310. @@ -1181,10 +1181,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2311.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2312.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  2313.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2314. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  2315. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2316. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2317. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2318. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  2319. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2320. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2321.  asmflags =
  2322.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2323.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2324. diff --git a/Release_x64/obj/chrome/chrome_child_dll.ninja b/Release_x64/obj/chrome/chrome_child_dll.ninja
  2325. index f9f0e4a..3cbdf15 100644
  2326. --- a/Release_x64/obj/chrome/chrome_child_dll.ninja
  2327. +++ b/Release_x64/obj/chrome/chrome_child_dll.ninja
  2328. @@ -815,9 +815,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2329.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2330.      -DCHROME_MULTIPLE_DLL_CHILD -DMOJO_USE_SYSTEM_IMPL -DTOOLKIT_VIEWS=1 $
  2331.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2332. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  2333. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2334. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2335. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2336. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2337.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2338.  asmflags =
  2339.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2340. diff --git a/Release_x64/obj/chrome/chrome_main_dll.ninja b/Release_x64/obj/chrome/chrome_main_dll.ninja
  2341. index 1f372e8..ce29056 100644
  2342. --- a/Release_x64/obj/chrome/chrome_main_dll.ninja
  2343. +++ b/Release_x64/obj/chrome/chrome_main_dll.ninja
  2344. @@ -971,9 +971,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2345.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2346.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2347.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2348. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  2349. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2350. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2351. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2352. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2353.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2354.  asmflags =
  2355.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2356. diff --git a/Release_x64/obj/chrome/interactive_ui_tests.ninja b/Release_x64/obj/chrome/interactive_ui_tests.ninja
  2357. index 0c88291..6ca3978 100644
  2358. --- a/Release_x64/obj/chrome/interactive_ui_tests.ninja
  2359. +++ b/Release_x64/obj/chrome/interactive_ui_tests.ninja
  2360. @@ -1196,10 +1196,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2361.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DHUNSPELL_STATIC $
  2362.      -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DU_USING_ICU_NAMESPACE=0 $
  2363.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2364. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  2365. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2366. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2367. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2368. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  2369. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2370. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2371.  asmflags =
  2372.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2373.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2374. diff --git a/Release_x64/obj/chrome/performance_browser_tests.ninja b/Release_x64/obj/chrome/performance_browser_tests.ninja
  2375. index ca9efcd..407fb3c 100644
  2376. --- a/Release_x64/obj/chrome/performance_browser_tests.ninja
  2377. +++ b/Release_x64/obj/chrome/performance_browser_tests.ninja
  2378. @@ -1205,8 +1205,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2379.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2380.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  2381.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2382. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2383. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2384. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2385. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2386.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2387.  asmflags =
  2388.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2389. diff --git a/Release_x64/obj/chrome/setup.ninja b/Release_x64/obj/chrome/setup.ninja
  2390. index 33a971b..1453cbd 100644
  2391. --- a/Release_x64/obj/chrome/setup.ninja
  2392. +++ b/Release_x64/obj/chrome/setup.ninja
  2393. @@ -110,9 +110,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2394.      -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 $
  2395.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2396.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2397. -    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DPERFTOOLS_DLL_DECL= $
  2398. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2399. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2400. +    -DRLZ_NETWORK_IMPLEMENTATION_CHROME_NET -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2401. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2402.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2403.  asmflags =
  2404.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2405. diff --git a/Release_x64/obj/chrome/setup_unittests.ninja b/Release_x64/obj/chrome/setup_unittests.ninja
  2406. index 8e3d14e..7b410a0 100644
  2407. --- a/Release_x64/obj/chrome/setup_unittests.ninja
  2408. +++ b/Release_x64/obj/chrome/setup_unittests.ninja
  2409. @@ -80,8 +80,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2410.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2411.      -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DU_USING_ICU_NAMESPACE=0 $
  2412.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DUNIT_TEST $
  2413. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2414. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2415. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2416. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2417.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2418.  asmflags =
  2419.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2420. diff --git a/Release_x64/obj/chrome/sync_integration_tests.ninja b/Release_x64/obj/chrome/sync_integration_tests.ninja
  2421. index 5b0231e..156162c 100644
  2422. --- a/Release_x64/obj/chrome/sync_integration_tests.ninja
  2423. +++ b/Release_x64/obj/chrome/sync_integration_tests.ninja
  2424. @@ -1193,10 +1193,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2425.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2426.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  2427.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2428. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  2429. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2430. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2431. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2432. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  2433. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2434. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2435.  asmflags =
  2436.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2437.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2438. diff --git a/Release_x64/obj/chrome/sync_performance_tests.ninja b/Release_x64/obj/chrome/sync_performance_tests.ninja
  2439. index 86c525c..a7aae69 100644
  2440. --- a/Release_x64/obj/chrome/sync_performance_tests.ninja
  2441. +++ b/Release_x64/obj/chrome/sync_performance_tests.ninja
  2442. @@ -1187,10 +1187,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2443.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2444.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2445.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2446. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST $
  2447. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2448. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2449. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2450. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUNIT_TEST -DUSE_LIBPCI=1 $
  2451. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2452. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2453.  asmflags =
  2454.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2455.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2456. diff --git a/Release_x64/obj/chrome/unit_tests.ninja b/Release_x64/obj/chrome/unit_tests.ninja
  2457. index 4c3cb86..f4d033d 100644
  2458. --- a/Release_x64/obj/chrome/unit_tests.ninja
  2459. +++ b/Release_x64/obj/chrome/unit_tests.ninja
  2460. @@ -1457,9 +1457,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2461.      -DI18N_PHONENUMBERS_USE_ICU_REGEXP=1 $
  2462.      -DI18N_PHONENUMBERS_NO_THREAD_SAFETY=1 -DWEBRTC_CHROMIUM_BUILD $
  2463.      -DWEBRTC_WIN -DMESA_EGL_NO_X11_HEADERS -DHUNSPELL_STATIC $
  2464. -    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DPERFTOOLS_DLL_DECL= $
  2465. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2466. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2467. +    -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2468. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2469.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2470.  asmflags =
  2471.  rcflags = /I..\.. /Igen /I..\..\chrome /l409
  2472. diff --git a/Release_x64/obj/components/components_browsertests.ninja b/Release_x64/obj/components/components_browsertests.ninja
  2473. index 13f6cea..358f110 100644
  2474. --- a/Release_x64/obj/components/components_browsertests.ninja
  2475. +++ b/Release_x64/obj/components/components_browsertests.ninja
  2476. @@ -678,9 +678,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2477.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2478.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2479.      -DUNIT_TEST -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2480. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  2481. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2482. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2483. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2484. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2485.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2486.  asmflags =
  2487.  rcflags = /I..\.. /Igen /I..\..\components /l409
  2488. diff --git a/Release_x64/obj/components/components_perftests.ninja b/Release_x64/obj/components/components_perftests.ninja
  2489. index c55d9d0..eb79498 100644
  2490. --- a/Release_x64/obj/components/components_perftests.ninja
  2491. +++ b/Release_x64/obj/components/components_perftests.ninja
  2492. @@ -526,10 +526,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2493.      -DPERF_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2494.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2495.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2496. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2497. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2498. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2499. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2500. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  2501. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2502. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2503.  asmflags =
  2504.  rcflags = /I..\.. /Igen /I..\..\components /l409
  2505.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2506. diff --git a/Release_x64/obj/components/components_unittests.ninja b/Release_x64/obj/components/components_unittests.ninja
  2507. index 8938faa..7d0277a 100644
  2508. --- a/Release_x64/obj/components/components_unittests.ninja
  2509. +++ b/Release_x64/obj/components/components_unittests.ninja
  2510. @@ -928,7 +928,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2511.      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER $
  2512.      "-DPRECACHE_CONFIG_SETTINGS_URL=\"https://www.gstatic.com/chrome/wifiprefetch/precache_config\"" $
  2513.      "-DPRECACHE_MANIFEST_URL_PREFIX=\"https://www.gstatic.com/chrome/wifiprefetch/hosts/\"" $
  2514. -    -DPERFTOOLS_DLL_DECL= -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2515. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2516.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2517.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2518.      -DOPENSSL_SMALL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2519. diff --git a/Release_x64/obj/components/test_runner/test_runner.ninja b/Release_x64/obj/components/test_runner/test_runner.ninja
  2520. index d8eba22..5bd555f 100644
  2521. --- a/Release_x64/obj/components/test_runner/test_runner.ninja
  2522. +++ b/Release_x64/obj/components/test_runner/test_runner.ninja
  2523. @@ -45,7 +45,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2524.      -DU_STATIC_IMPLEMENTATION -DGR_GL_FUNCTION_TYPE=__stdcall $
  2525.      -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS $
  2526.      -DSK_IGNORE_GL_TEXTURE_TARGET -DCHROME_PNG_WRITE_SUPPORT $
  2527. -    -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2528. +    -DPNG_USER_CONFIG -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2529.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2530.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2531.  asmflags =
  2532. diff --git a/Release_x64/obj/content/content_browsertests.ninja b/Release_x64/obj/content/content_browsertests.ninja
  2533. index 475d726..df054a3 100644
  2534. --- a/Release_x64/obj/content/content_browsertests.ninja
  2535. +++ b/Release_x64/obj/content/content_browsertests.ninja
  2536. @@ -573,8 +573,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2537.      -DSK_IGNORE_GL_TEXTURE_TARGET -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 $
  2538.      -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2539.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DMESA_EGL_NO_X11_HEADERS $
  2540. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2541. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2542. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2543. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2544.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2545.  asmflags =
  2546.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2547. diff --git a/Release_x64/obj/content/content_gl_benchmark.ninja b/Release_x64/obj/content/content_gl_benchmark.ninja
  2548. index 987b018..e61be2b 100644
  2549. --- a/Release_x64/obj/content/content_gl_benchmark.ninja
  2550. +++ b/Release_x64/obj/content/content_gl_benchmark.ninja
  2551. @@ -521,9 +521,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2552.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2553.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2554.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2555. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2556. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2557. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2558. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2559. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2560. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2561.  asmflags =
  2562.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2563.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2564. diff --git a/Release_x64/obj/content/content_gl_tests.ninja b/Release_x64/obj/content/content_gl_tests.ninja
  2565. index 55e612d..8b02c69 100644
  2566. --- a/Release_x64/obj/content/content_gl_tests.ninja
  2567. +++ b/Release_x64/obj/content/content_gl_tests.ninja
  2568. @@ -523,9 +523,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2569.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2570.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2571.      -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2572. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2573. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2574. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2575. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2576. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2577. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2578.  asmflags =
  2579.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2580.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2581. diff --git a/Release_x64/obj/content/content_perftests.ninja b/Release_x64/obj/content/content_perftests.ninja
  2582. index e84bf41..0b48e01 100644
  2583. --- a/Release_x64/obj/content/content_perftests.ninja
  2584. +++ b/Release_x64/obj/content/content_perftests.ninja
  2585. @@ -518,8 +518,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2586.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2587.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2588.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2589. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2590. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2591. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2592. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2593.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2594.  asmflags =
  2595.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2596. diff --git a/Release_x64/obj/content/content_renderer.ninja b/Release_x64/obj/content/content_renderer.ninja
  2597. index f2efdeb..0f7e14c 100644
  2598. --- a/Release_x64/obj/content/content_renderer.ninja
  2599. +++ b/Release_x64/obj/content/content_renderer.ninja
  2600. @@ -70,10 +70,9 @@ defines = -DCONTENT_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS $
  2601.      -DU_STATIC_IMPLEMENTATION -DFEATURE_ENABLE_SSL $
  2602.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  2603.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  2604. -    -DWEBRTC_WIN -DXML_STATIC -DPERFTOOLS_DLL_DECL= -DWEBRTC_CHROMIUM_BUILD $
  2605. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2606. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2607. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2608. +    -DWEBRTC_WIN -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  2609. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2610. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2611.  asmflags =
  2612.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2613.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2614. diff --git a/Release_x64/obj/content/content_shell.ninja b/Release_x64/obj/content/content_shell.ninja
  2615. index 51c0a00..9328b6b 100644
  2616. --- a/Release_x64/obj/content/content_shell.ninja
  2617. +++ b/Release_x64/obj/content/content_shell.ninja
  2618. @@ -551,7 +551,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2619.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2620.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2621.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  2622. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2623. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2624.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2625.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2626.  asmflags =
  2627. diff --git a/Release_x64/obj/content/content_shell_lib.ninja b/Release_x64/obj/content/content_shell_lib.ninja
  2628. index 84b2ac6..6d5918e 100644
  2629. --- a/Release_x64/obj/content/content_shell_lib.ninja
  2630. +++ b/Release_x64/obj/content/content_shell_lib.ninja
  2631. @@ -74,9 +74,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2632.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2633.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2634.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2635. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2636. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2637. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2638. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2639. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2640. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2641.  asmflags =
  2642.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2643.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2644. diff --git a/Release_x64/obj/content/content_unittests.ninja b/Release_x64/obj/content/content_unittests.ninja
  2645. index 25f8a60..a6bcd9c 100644
  2646. --- a/Release_x64/obj/content/content_unittests.ninja
  2647. +++ b/Release_x64/obj/content/content_unittests.ninja
  2648. @@ -527,10 +527,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2649.      -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH $
  2650.      -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -D_CRT_SECURE_NO_WARNINGS $
  2651.      -DWEBRTC_WIN -DXML_STATIC -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG $
  2652. -    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DPERFTOOLS_DLL_DECL= $
  2653. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2654. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2655. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2656. +    -DMESA_EGL_NO_X11_HEADERS -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 $
  2657. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2658. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2659.  asmflags =
  2660.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2661.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2662. diff --git a/Release_x64/obj/content/video_decode_accelerator_unittest.ninja b/Release_x64/obj/content/video_decode_accelerator_unittest.ninja
  2663. index 33205de..157cbbc 100644
  2664. --- a/Release_x64/obj/content/video_decode_accelerator_unittest.ninja
  2665. +++ b/Release_x64/obj/content/video_decode_accelerator_unittest.ninja
  2666. @@ -489,9 +489,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2667.      -DUNIT_TEST -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2668.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2669.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2670. -    -DMESA_EGL_NO_X11_HEADERS -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2671. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2672. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2673. +    -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2674. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2675. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2676.  asmflags =
  2677.  rcflags = /I..\.. /Igen /I..\..\content /l409
  2678.  includes = -Igen -I..\..\third_party\wtl\include $
  2679. diff --git a/Release_x64/obj/extensions/extensions_browsertests.ninja b/Release_x64/obj/extensions/extensions_browsertests.ninja
  2680. index cc7ee91..d1f7d04 100644
  2681. --- a/Release_x64/obj/extensions/extensions_browsertests.ninja
  2682. +++ b/Release_x64/obj/extensions/extensions_browsertests.ninja
  2683. @@ -733,10 +733,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2684.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2685.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2686.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2687. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2688. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2689. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2690. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2691. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  2692. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2693. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2694.  asmflags =
  2695.  rcflags = /I..\.. /Igen /I..\..\extensions /l409
  2696.  includes = -Igen -I..\..\third_party\wtl\include $
  2697. diff --git a/Release_x64/obj/extensions/extensions_unittests.ninja b/Release_x64/obj/extensions/extensions_unittests.ninja
  2698. index 47587e6..d70b369 100644
  2699. --- a/Release_x64/obj/extensions/extensions_unittests.ninja
  2700. +++ b/Release_x64/obj/extensions/extensions_unittests.ninja
  2701. @@ -593,9 +593,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2702.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2703.      -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2704.      -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI $
  2705. -    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPERFTOOLS_DLL_DECL= $
  2706. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2707. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2708. +    -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2709. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2710.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2711.  asmflags =
  2712.  rcflags = /I..\.. /Igen /I..\..\extensions /l409
  2713. diff --git a/Release_x64/obj/extensions/shell/app_shell.ninja b/Release_x64/obj/extensions/shell/app_shell.ninja
  2714. index 672cb80..b01c2eb 100644
  2715. --- a/Release_x64/obj/extensions/shell/app_shell.ninja
  2716. +++ b/Release_x64/obj/extensions/shell/app_shell.ninja
  2717. @@ -716,8 +716,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2718.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  2719.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2720.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2721. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2722. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2723. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2724. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2725.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2726.  asmflags =
  2727.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /l409
  2728. diff --git a/Release_x64/obj/extensions/shell/app_shell_unittests.ninja b/Release_x64/obj/extensions/shell/app_shell_unittests.ninja
  2729. index fdc4795..bc442c0 100644
  2730. --- a/Release_x64/obj/extensions/shell/app_shell_unittests.ninja
  2731. +++ b/Release_x64/obj/extensions/shell/app_shell_unittests.ninja
  2732. @@ -720,10 +720,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2733.      -DTOOLKIT_VIEWS=1 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2734.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2735.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2736. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST $
  2737. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2738. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2739. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2740. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUNIT_TEST -DUSE_LIBPCI=1 $
  2741. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2742. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2743.  asmflags =
  2744.  rcflags = /I..\.. /Igen /I..\..\extensions\shell /l409
  2745.  includes = -Igen -I..\..\third_party\wtl\include $
  2746. diff --git a/Release_x64/obj/media/media_unittests.ninja b/Release_x64/obj/media/media_unittests.ninja
  2747. index dc8f37c..de4123f 100644
  2748. --- a/Release_x64/obj/media/media_unittests.ninja
  2749. +++ b/Release_x64/obj/media/media_unittests.ninja
  2750. @@ -106,8 +106,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2751.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2752.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2753.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2754. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2755. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2756. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2757. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2758.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2759.  asmflags =
  2760.  rcflags = /I..\.. /Igen /I..\..\media /l409
  2761. diff --git a/Release_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja b/Release_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2762. index 50c817d..51ae14d 100644
  2763. --- a/Release_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2764. +++ b/Release_x64/obj/third_party/WebKit/Source/platform/blink_heap_unittests.ninja
  2765. @@ -531,10 +531,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2766.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2767.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2768.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2769. -    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPERFTOOLS_DLL_DECL= $
  2770. -    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2771. -    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2772. -    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2773. +    -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DUSE_LIBPCI=1 $
  2774. +    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2775. +    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2776.  asmflags =
  2777.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\platform /l409
  2778.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2779. diff --git a/Release_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja b/Release_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2780. index 9841cde..5545c28 100644
  2781. --- a/Release_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2782. +++ b/Release_x64/obj/third_party/WebKit/Source/web/webkit_unit_tests.ninja
  2783. @@ -538,8 +538,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2784.      -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 $
  2785.      -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_WEB_AUDIO=1 $
  2786.      -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 $
  2787. -    -DUNIT_TEST -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2788. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2789. +    -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2790. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2791.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2792.  asmflags =
  2793.  rcflags = /I..\.. /Igen /I..\..\third_party\WebKit\Source\web /l409
  2794. diff --git a/Release_x64/obj/ui/app_list/app_list_demo.ninja b/Release_x64/obj/ui/app_list/app_list_demo.ninja
  2795. index bc594a6..cf22b5b 100644
  2796. --- a/Release_x64/obj/ui/app_list/app_list_demo.ninja
  2797. +++ b/Release_x64/obj/ui/app_list/app_list_demo.ninja
  2798. @@ -564,8 +564,8 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2799.      -DGTEST_LANG_CXX11=0 -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2800.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2801.      -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION $
  2802. -    -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2803. -    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2804. +    -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS $
  2805. +    -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2806.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2807.  asmflags =
  2808.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /l409
  2809. diff --git a/Release_x64/obj/ui/app_list/app_list_unittests.ninja b/Release_x64/obj/ui/app_list/app_list_unittests.ninja
  2810. index 3cea2a6..bb205b7 100644
  2811. --- a/Release_x64/obj/ui/app_list/app_list_unittests.ninja
  2812. +++ b/Release_x64/obj/ui/app_list/app_list_unittests.ninja
  2813. @@ -165,9 +165,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2814.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2815.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2816.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2817. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2818. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2819. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2820. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2821. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2822. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2823.  asmflags =
  2824.  rcflags = /I..\.. /Igen /I..\..\ui\app_list /l409
  2825.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2826. diff --git a/Release_x64/obj/ui/keyboard/keyboard_unittests.ninja b/Release_x64/obj/ui/keyboard/keyboard_unittests.ninja
  2827. index 0639b3e..6b847b3 100644
  2828. --- a/Release_x64/obj/ui/keyboard/keyboard_unittests.ninja
  2829. +++ b/Release_x64/obj/ui/keyboard/keyboard_unittests.ninja
  2830. @@ -146,9 +146,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2831.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2832.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2833.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2834. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2835. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2836. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2837. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2838. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2839. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2840.  asmflags =
  2841.  rcflags = /I..\.. /Igen /I..\..\ui\keyboard /l409
  2842.  includes = -Igen -I..\..\third_party\wtl\include -I..\.. $
  2843. diff --git a/Release_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja b/Release_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2844. index 9d1cb9b..d6d0494 100644
  2845. --- a/Release_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2846. +++ b/Release_x64/obj/ui/views/examples/views_examples_with_content_exe.ninja
  2847. @@ -562,7 +562,7 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2848.      -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA $
  2849.      -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL $
  2850.      -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
  2851. -    -DTOOLKIT_VIEWS=1 -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2852. +    -DTOOLKIT_VIEWS=1 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2853.      -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2854.      -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2855.  asmflags =
  2856. diff --git a/Release_x64/obj/ui/views/views_unittests.ninja b/Release_x64/obj/ui/views/views_unittests.ninja
  2857. index 30fcf74..4f6daa2 100644
  2858. --- a/Release_x64/obj/ui/views/views_unittests.ninja
  2859. +++ b/Release_x64/obj/ui/views/views_unittests.ninja
  2860. @@ -161,9 +161,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
  2861.      -DGR_GL_FUNCTION_TYPE=__stdcall -DSK_SUPPORT_GPU=1 $
  2862.      -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_IGNORE_GL_TEXTURE_TARGET $
  2863.      -DUNIT_TEST -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 $
  2864. -    -DU_STATIC_IMPLEMENTATION -DPERFTOOLS_DLL_DECL= -DUSE_LIBPCI=1 $
  2865. -    -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS $
  2866. -    -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2867. +    -DU_STATIC_IMPLEMENTATION -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
  2868. +    -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND $
  2869. +    -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
  2870.  asmflags =
  2871.  rcflags = /I..\.. /Igen /I..\..\ui\views /l409
  2872.  includes = -Igen -I..\..\third_party\wtl\include -I..\..\ui $
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!