commit 969e4f8b21148db61413abaea788d67f126cde58
author Elliott Hughes <enh@google.com> Wed Dec 20 12:34:09 2017 -0800
committer Elliott Hughes <enh@google.com> Wed Dec 20 12:34:09 2017 -0800
tree 80ed2e2dc2b76ec340f7d546a4541d9cfa617f9f
parent a9c7e6d15201dbb701dc1f535689910a581912b0

StartsWith/EndsWith allow std::string prefixes/suffixes now.

Bug: N/A
Test: builds
Change-Id: I502f7ff687ac164ae9c2c639b4c8eab13291ea62

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index e0d23da..8a56894 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -882,7 +882,7 @@
         //        backs to do weird things.)
         const char* apk_path = package_parameters_.apk_path;
         CHECK(apk_path != nullptr);
-        if (StartsWith(apk_path, android_root_.c_str())) {
+        if (StartsWith(apk_path, android_root_)) {
             const char* last_slash = strrchr(apk_path, '/');
             if (last_slash != nullptr) {
                 std::string path(apk_path, last_slash - apk_path + 1);