Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix warning from clang+mingw"

Browse Source 
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8
This commit is contained in:
Dan Willemsen
2017-11-30 23:18:38 +00:00
committed by android-build-merger
parent 4f9f278341 7fce15dc5e
commit 31bcd7acea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt2/link/ProductFilter_test.cpp
View File

@@ -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));
} }