commit 434c4c8fb8868eeea65a9df529f1567c2e57c867
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 cc272acea2149d34a28cc8ce5f179b6f8f64cffa
parent e9bf7d9d015fe65e469696f734b1917a36f09698

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