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

Commit be593a77 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

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

parents 4b7b5570 c3344e8a

tools/split-select/RuleGenerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

tools/split-select/RuleGenerator_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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) {

tools/split-select/TestRules.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()