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

Merge "split-select: fix OSX build" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-11-11 02:29:57 +00:00
committed by Android (Google) Code Review
parent 4b7b557055 c3344e8a6d
commit be593a7778
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/split-select/RuleGenerator.cpp
View File

@@ -38,7 +38,7 @@ sp<Rule> RuleGenerator::generateDensity(const Vector<int>& allDensities, size_t
densityRule->op = Rule::AND_SUBRULES;
const bool hasAnyDensity = std::find(allDensities.begin(),
allDensities.end(), ResTable_config::DENSITY_ANY) != allDensities.end();
allDensities.end(), (int) ResTable_config::DENSITY_ANY) != allDensities.end();
if (hasAnyDensity) {
sp<Rule> version = new Rule();

8
tools/split-select/RuleGenerator_test.cpp
View File

@@ -47,10 +47,10 @@ TEST(RuleGeneratorTest, testAbiRules) {
}
TEST(RuleGeneratorTest, densityConstantsAreSane) {
EXPECT_LT(263, ConfigDescription::DENSITY_XHIGH);
EXPECT_GT(262, ConfigDescription::DENSITY_HIGH);
EXPECT_LT(363, ConfigDescription::DENSITY_XXHIGH);
EXPECT_GT(362, ConfigDescription::DENSITY_XHIGH);
EXPECT_LT(263, (int) ConfigDescription::DENSITY_XHIGH);
EXPECT_GT(262, (int) ConfigDescription::DENSITY_HIGH);
EXPECT_LT(363, (int) ConfigDescription::DENSITY_XXHIGH);
EXPECT_GT(362, (int) ConfigDescription::DENSITY_XHIGH);
}
TEST(RuleGeneratorTest, testDensityRules) {

2
tools/split-select/TestRules.cpp
View File

@@ -75,7 +75,7 @@ const Rule AlwaysTrue() {
const char*, const char*,
const sp<Rule>& actual, const Rule& expected) {
const String8 expectedStr(expected.toJson());
const String8 actualStr(actual != NULL ? actual->toJson() : "");
const String8 actualStr(actual != NULL ? actual->toJson() : String8());
if (expectedStr != actualStr) {
return ::testing::AssertionFailure()