commit 80fd4549e39aa5c14229d1b2f46fe3f98f148f51
author Dan Austin <danielaustin@google.com> Mon Mar 28 14:37:01 2016 -0700
committer Dan Austin <danielaustin@google.com> Mon Mar 28 23:28:48 2016 +0000
tree fc26c98c99761a08d9a490df8efb8349a932cd0e
parent 8aeabe15dd38093029714dabb1713724400cf5f1

Address const issue in preparation for libcxx rebase.

Change-Id: I80c3349ee93d2b3f16c6fadc7f34b2bf4f2cc0d3

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