commit b748e0a19b27b0196ab23474d49d0977b689e208
author Dan Austin <danielaustin@google.com> Wed Mar 30 17:48:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 17:48:20 2016 +0000
tree bd40cbda01b2b9997706b36c5311c99b2fd8525e
parent 8258f42abfb568761fe2048d6bd6fc947a846a01
parent 434c4c8fb8868eeea65a9df529f1567c2e57c867

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

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

Change-Id: Ia54835c35695ae76b3c093adfb256bab2446ff65

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