commit 0bab7c3dbd7aa92f31c1fe1d6eade07384ca3d5d
author Dan Austin <danielaustin@google.com> Wed Mar 30 19:15:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 19:15:38 2016 +0000
tree 5b16ed2590d65844e14a8f5d1395cb1728eb5353
parent 4eb63f3f4abf66ca2570ce99ca3d63566b63d46d
parent 61e5a6625dfdb586abb9f83b20bc1d727a783225

Merge "Address const issue in preparation for libcxx rebase." am: a2a13e3
am: 61e5a66

* commit '61e5a6625dfdb586abb9f83b20bc1d727a783225':
  Address const issue in preparation for libcxx rebase.

Change-Id: I883b8210df7c8ddd1f82914ba448af0175f53437

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