Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 9 insertions, 6 deletions

diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index 85781d251..cf990c79b 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -14,25 +14,28 @@ gn_args += \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
-    enable_resource_whitelist_generation=false \
+    enable_resource_allowlist_generation=false \
     enable_swiftshader=false \
+    enable_swiftshader_vulkan=false \
     angle_enable_swiftshader=false \
-    enable_web_auth=true \
     enable_web_speech=false \
     enable_widevine=true \
     forbid_non_component_debug_builds=false \
     has_native_accessibility=false \
     safe_browsing_mode=0 \
+    skia_use_dawn=false \
     toolkit_views=false \
     treat_warnings_as_errors=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
-    use_custom_libcxx=false
+    use_custom_libcxx=false \
+    chrome_pgo_phase=0 \
+    enable_hangout_services_extension=true
 
-# No closure compile supported at this time
+# Closure compile requires Java
 gn_args += \
-    closure_compile=false \
-    optimize_webui=false
+    optimize_webui=false \
+    enable_js_type_check=false
 
 # We always embed v8 startup data currently
 gn_args += \