summaryrefslogtreecommitdiff
path: root/tools/split-select/Main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/split-select/Main.cpp')
-rw-r--r--tools/split-select/Main.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/tools/split-select/Main.cpp b/tools/split-select/Main.cpp
index e6966db0aa00..d3eb012a80e9 100644
--- a/tools/split-select/Main.cpp
+++ b/tools/split-select/Main.cpp
@@ -182,18 +182,14 @@ static bool getAppInfo(const String8& path, AppInfo& outInfo) {
if (type >= Res_value::TYPE_FIRST_INT && type <= Res_value::TYPE_LAST_INT) {
outInfo.minSdkVersion = xml.getAttributeData(idx);
} else if (type == Res_value::TYPE_STRING) {
- auto minSdk8 = xml.getStrings().string8ObjectAt(idx);
- if (!minSdk8.has_value()) {
- fprintf(stderr, "warning: failed to retrieve android:minSdkVersion.\n");
+ String8 minSdk8(xml.getStrings().string8ObjectAt(idx));
+ char* endPtr;
+ int minSdk = strtol(minSdk8.string(), &endPtr, 10);
+ if (endPtr != minSdk8.string() + minSdk8.size()) {
+ fprintf(stderr, "warning: failed to parse android:minSdkVersion '%s'\n",
+ minSdk8.string());
} else {
- char *endPtr;
- int minSdk = strtol(minSdk8->string(), &endPtr, 10);
- if (endPtr != minSdk8->string() + minSdk8->size()) {
- fprintf(stderr, "warning: failed to parse android:minSdkVersion '%s'\n",
- minSdk8->string());
- } else {
- outInfo.minSdkVersion = minSdk;
- }
+ outInfo.minSdkVersion = minSdk;
}
} else {
fprintf(stderr, "warning: unrecognized value for android:minSdkVersion.\n");