commit 3601d3af3a6bfc75046ae3523ce2286d1f63c561
author Elliott Hughes <enh@google.com> Thu Dec 21 06:26:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 06:26:05 2017 +0000
tree fda1d52a88507cea379bfc6361ebae6ee45752f6
parent f03a7f8a5caabefb00b1bc8293b39c1c1c9b5793
parent af24c0d24640df7dc1c422d8758d09bf80486ce6

Merge "StartsWith/EndsWith allow std::string prefixes/suffixes now." am: 2aa4cc4f36
am: af24c0d246

Change-Id: I3ac3071c0d59c809b37b7abf3393899dee6380bd

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 88edd0a..29d5c32 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -958,7 +958,7 @@
   if (EndsWith(oat_path, ".dex")) {
     std::string new_path = oat_path;
     new_path.replace(new_path.length() - strlen(".dex"), strlen(".dex"), new_ext);
-    CHECK(EndsWith(new_path, new_ext.c_str()));
+    CHECK(EndsWith(new_path, new_ext));
     return new_path;
   }
 

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);