Merge "Don't add a '/' if it's already there."

1 files changed, 1 insertions, 1 deletions

diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index b62764f4c6..54e75588b9 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -209,7 +209,7 @@ bool ClassLoaderContext::OpenDexFiles(InstructionSet isa, const std::string& cla
       // If path is relative, append it to the provided base directory.
       std::string location = cp_elem;
       if (location[0] != '/' && !classpath_dir.empty()) {
-        location = classpath_dir + '/' + location;
+        location = classpath_dir + (classpath_dir.back() == '/' ? "" : "/") + location;
       }
 
       std::string error_msg;