Snap for 6439596 from adc5c3d79d629fdb7e95ba1d05fe5195df11a116 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I3f9f7847e81c5f4657d18f438b5b2df309bf6e4e

2 files changed, 7 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index e4f393412b..500b602993 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,6 +87,11 @@ cc_defaults {
         "-Wno-unused-function",
         "-Wno-unused-variable",
     ],
+
+    clang_cflags: [
+        // Temporarily suppress the warnings http://b/38232827
+        "-Wno-error=unused-lambda-capture",
+    ],
 }
 
 libchromeCommonSrc = [
diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc
index 6cf6bc309d..774347939a 100644
--- a/base/message_loop/message_loop_unittest.cc
+++ b/base/message_loop/message_loop_unittest.cc
@@ -1774,7 +1774,7 @@ TEST_P(MessageLoopTypedTest, NestableTasksAllowedManually) {
 }
 
 INSTANTIATE_TEST_CASE_P(
-    All,
+    ,
     MessageLoopTypedTest,
     ::testing::Values(MessageLoopTypedTestParams(
                           MessageLoop::TYPE_DEFAULT,
@@ -2227,7 +2227,7 @@ TEST_P(MessageLoopTest, SequenceLocalStorageDifferentMessageLoops) {
 }
 
 INSTANTIATE_TEST_CASE_P(
-    All,
+    ,
     MessageLoopTest,
     ::testing::Values(TaskSchedulerAvailability::NO_TASK_SCHEDULER
                       // Unsupported in libchrome