commit be593a7778fe053f67fa37dcc2174639ed725b17
author Adam Lesinski <adamlesinski@google.com> Tue Nov 11 02:29:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 11 02:29:58 2014 +0000
tree ab7863cddb787caecfc4ac303bdcbf3cca13e831
parent 4b7b55705561be791cdc8258f2ebcdd0b8ed1427
parent c3344e8a6d7402326204d1232a4c5ffa382f70a9

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

tools/split-select/RuleGenerator.cpp

diff --git a/tools/split-select/RuleGenerator.cpp b/tools/split-select/RuleGenerator.cpp
index 72bb0c7..83c9795 100644
--- a/tools/split-select/RuleGenerator.cpp
+++ b/tools/split-select/RuleGenerator.cpp
@@ -38,7 +38,7 @@
         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

diff --git a/tools/split-select/RuleGenerator_test.cpp b/tools/split-select/RuleGenerator_test.cpp
index 778d604..470cadc 100644
--- a/tools/split-select/RuleGenerator_test.cpp
+++ b/tools/split-select/RuleGenerator_test.cpp
@@ -47,10 +47,10 @@
 }
 
 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

diff --git a/tools/split-select/TestRules.cpp b/tools/split-select/TestRules.cpp
index f980dc4..86ccd6a 100644
--- a/tools/split-select/TestRules.cpp
+++ b/tools/split-select/TestRules.cpp
@@ -75,7 +75,7 @@
         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()