Merge "Actually correctly call vector::erase after remove_if."

am: 2e998d37ce

Change-Id: Ia64b9e88ce9fab878f62ed32a07b736cb2c487c0
This commit is contained in:
Josh Gao 2017-10-21 03:06:19 +00:00 committed by android-build-merger
commit e7ccd86416

View file

@ -130,7 +130,8 @@ static void parse_LD_PRELOAD(const char* path) {
// We have historically supported ':' as well as ' ' in LD_PRELOAD. // We have historically supported ':' as well as ' ' in LD_PRELOAD.
g_ld_preload_names = android::base::Split(path, " :"); g_ld_preload_names = android::base::Split(path, " :");
g_ld_preload_names.erase(std::remove_if(g_ld_preload_names.begin(), g_ld_preload_names.end(), g_ld_preload_names.erase(std::remove_if(g_ld_preload_names.begin(), g_ld_preload_names.end(),
[](const std::string& s) { return s.empty(); })); [](const std::string& s) { return s.empty(); }),
g_ld_preload_names.end());
} }
} }