commit a2a13e3267850b4eaf2689b0e02cc499228b7bf5
author Dan Austin <danielaustin@google.com> Wed Mar 30 17:40:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 30 17:40:01 2016 +0000
tree bd40cbda01b2b9997706b36c5311c99b2fd8525e
parent a348dfcd651d8410bba41cde63c45e3c4d760d5a
parent 80fd4549e39aa5c14229d1b2f46fe3f98f148f51

Merge "Address const issue in preparation for libcxx rebase."

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index ce10708..3eeed34 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -246,7 +246,7 @@
         char** current = environ;
         while (char* env_cstr = *current++) {
             std::string env_string = env_cstr;
-            char* delimiter = strchr(env_string.c_str(), '=');
+            char* delimiter = strchr(&env_string[0], '=');
 
             // Drop any values that don't contain '='.
             if (delimiter) {