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
This commit is contained in:
Dan Austin 2016-03-30 19:15:38 +00:00 committed by android-build-merger
commit 0bab7c3dbd

View file

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