From 7f08644bd7acc27d896bf7380d26e89ab7dfd381 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Mon, 3 Jun 2019 23:01:34 -0700
Subject: [PATCH] Fix atoi build errors

Use strtol instead of atoi to check vendor partition version.

Bug: 119390857
Test: manual
Change-Id: I49c5963d8bbc5a803b3ccc0dd41d7bd7f2a42226
---
 cmds/idmap2/idmap2/Scan.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp
index 21c6bd280064f..cfac5f31e2e61 100644
--- a/cmds/idmap2/idmap2/Scan.cpp
+++ b/cmds/idmap2/idmap2/Scan.cpp
@@ -69,7 +69,10 @@ struct InputOverlay {
 
 bool VendorIsQOrLater() {
   constexpr int kQSdkVersion = 29;
-  int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data());
+  constexpr int kBase = 10;
+  std::string version_prop = android::base::GetProperty("ro.vndk.version", "29");
+  int version = strtol(version_prop.data(), nullptr, kBase);
+
   // If the string cannot be parsed, it is a development sdk codename.
   return version >= kQSdkVersion || version == 0;
 }