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

Commit 1da6e70b 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 

am: e2a0c1d0

Change-Id: I9212bf71035641d5efedf8f06627a62e9694806c
parents d583858a e2a0c1d0

tools/aapt2/link/ProductFilter_test.cpp

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

      test::ValueBuilder<Id>().SetSource(Source("tablet.xml")).Build(),

      context->GetDiagnostics()));

      context->GetDiagnostics()));





  ProductFilter filter({});

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

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

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





  EXPECT_NE(nullptr, test::GetValueForConfigAndProduct<Id>(

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

      test::ValueBuilder<Id>().SetSource(Source("default.xml")).Build(),

      context->GetDiagnostics()));

      context->GetDiagnostics()));





  ProductFilter filter({});

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

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

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

}

}