commit a354494ba08cfefc0700e061fce7b05a399a5087
author Christopher Ferris <cferris@google.com> Fri Mar 10 22:46:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 22:46:29 2017 +0000
tree 734ccfdebb25d22b72833dc6c1011cf626183f98
parent 49721574f4a054737f545cba0ff7b6d1663db03d
parent d7ec37b3cb6e671d2b7704cc3b5f95395a6f7bfc

Merge "Add a 2 width option of clang format."

adb/jdwp_service.cpp

diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 3135aa4..9589d88 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -571,7 +571,8 @@
     remove_socket(s);
 
     auto pred = [s](const auto& tracker) { return tracker.get() == s; };
-    std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);
+    _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),
+                         _jdwp_trackers.end());
 }
 
 static void jdwp_tracker_ready(asocket* s) {

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 03f878a..86fec6a 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -53,7 +53,7 @@
 
 # Pretty comprehensive set of native services. This list is helpful if all that's to be checked is an
 # app.
-ifeq ($(SANITIZE_LITE),true)
+ifeq ($(SANITIZE_LITE_SERVICES),true)
 SANITIZE_ASAN_OPTIONS_FOR := \
   adbd \
   ATFWD-daemon \