Build the split-select tool without C++11 support It was complicated to get the tool building on Windows, Linux, and OSX with C++11 support. OSX uses Clang to build C++11 binaries, which requires the libc++ standard library. Since most of the dependencies of this program are built against libstdc++, this was difficult to resolve. Now we build without C++11 support. Change-Id: I4e537c113734508a8f480a1c402ed237de4f0e60
diff --git a/tools/split-select/RuleGenerator.cpp b/tools/split-select/RuleGenerator.cpp index 669ae78..b8f3bcb 100644 --- a/tools/split-select/RuleGenerator.cpp +++ b/tools/split-select/RuleGenerator.cpp
@@ -65,12 +65,12 @@ sp<Rule> RuleGenerator::generateAbi(const Vector<abi::Variant>& splitAbis, size_t index) { const abi::Variant thisAbi = splitAbis[index]; - const std::vector<abi::Variant>& familyVariants = abi::getVariants(abi::getFamily(thisAbi)); + const Vector<abi::Variant>& familyVariants = abi::getVariants(abi::getFamily(thisAbi)); - std::vector<abi::Variant>::const_iterator start = + Vector<abi::Variant>::const_iterator start = std::find(familyVariants.begin(), familyVariants.end(), thisAbi); - std::vector<abi::Variant>::const_iterator end = familyVariants.end(); + Vector<abi::Variant>::const_iterator end = familyVariants.end(); if (index + 1 < splitAbis.size()) { end = std::find(start, familyVariants.end(), splitAbis[index + 1]); } @@ -127,7 +127,7 @@ rootRule->subrules.add(generateDensity(allDensities, densityIndex)); } - if (group[index].abi != abi::Variant::none) { + if (group[index].abi != abi::Variant_none) { size_t abiIndex = 0; Vector<abi::Variant> allVariants; allVariants.add(group[index].abi);