Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2a0c1d0 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix warning from clang+mingw" am: 7fce15dc 

am: 31bcd7ac

Change-Id: Ibb5c891fe3c219d75be8c124c9be215a31b2a241
parents 54a7cba9 31bcd7ac

tools/aapt2/link/ProductFilter_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ TEST(ProductFilterTest, SelectDefaultProduct) { 
      test::ValueBuilder<Id>().SetSource(Source("tablet.xml")).Build(),

      context->GetDiagnostics()));



  ProductFilter filter({});

  ProductFilter filter(std::unordered_set<std::string>{});

  ASSERT_TRUE(filter.Consume(context.get(), &table));



  EXPECT_NE(nullptr, test::GetValueForConfigAndProduct<Id>(
@@ -123,7 +123,7 @@ TEST(ProductFilterTest, FailOnMultipleDefaults) { 
      test::ValueBuilder<Id>().SetSource(Source("default.xml")).Build(),

      context->GetDiagnostics()));



  ProductFilter filter({});

  ProductFilter filter(std::unordered_set<std::string>{});

  ASSERT_FALSE(filter.Consume(context.get(), &table));

}