Tracking merge of dalvik-dev to master
Reordered bootclasspath to allow verification of all framework methods.
git cherry-pick --no-commit ec164a0170955fe63106c2576a65bc4ffb1df425
Address CVE-2011-1090.
git cherry-pick --no-commit 3365288d3c00072689cd9d733e055561cadc87b5
Change-Id: I6a89bc600ced06a0cb84ae1670cb7a6ea39de9c8
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 8ee4c9a..29864b2 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -35,6 +35,7 @@
socket_loopback_client.c \
socket_loopback_server.c \
socket_network_client.c \
+ sockets.c \
config_utils.c \
cpu_info.c \
load_file.c \