Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca7ef0f3 authored by Dan Austin's avatar Dan Austin Committed by android-build-merger
Browse files

Merge "Address const issue in preparation for libcxx rebase." am: a2a13e32 am: 61e5a662 

am: 0bab7c3d

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

Change-Id: Idaffc014595c1e29feac958fb008473b3c346f28
parents e9bf0cbc 0bab7c3d

adb/shell_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {