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/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;
   }