diff options
| author | Dan Austin <danielaustin@google.com> | 2016-03-30 17:40:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-30 17:40:01 +0000 |
| commit | a2a13e3267850b4eaf2689b0e02cc499228b7bf5 (patch) | |
| tree | bd40cbda01b2b9997706b36c5311c99b2fd8525e /adb | |
| parent | a348dfcd651d8410bba41cde63c45e3c4d760d5a (diff) | |
| parent | 80fd4549e39aa5c14229d1b2f46fe3f98f148f51 (diff) | |
| download | core-a2a13e3267850b4eaf2689b0e02cc499228b7bf5.tar.gz core-a2a13e3267850b4eaf2689b0e02cc499228b7bf5.tar.bz2 core-a2a13e3267850b4eaf2689b0e02cc499228b7bf5.zip | |
Merge "Address const issue in preparation for libcxx rebase."
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/shell_service.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp index ce107084c..3eeed34b2 100644 --- a/adb/shell_service.cpp +++ b/adb/shell_service.cpp @@ -246,7 +246,7 @@ bool Subprocess::ForkAndExec(std::string* error) { 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) { |