diff options
| author | jeffhao <jeffhao@google.com> | 2011-05-05 14:25:36 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-05-27 00:50:44 -0700 |
| commit | 2b8f76cdbb254ac1170087a40dbf30b7627f3516 (patch) | |
| tree | 98977ffaf8e41141eb5497af9ab2c9342050bd64 /libcutils/Android.mk | |
| parent | e555f54965b2955b2977c137bca66ca1be4be5f4 (diff) | |
| download | system_core-2b8f76cdbb254ac1170087a40dbf30b7627f3516.tar.gz system_core-2b8f76cdbb254ac1170087a40dbf30b7627f3516.tar.bz2 system_core-2b8f76cdbb254ac1170087a40dbf30b7627f3516.zip | |
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
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 8ee4c9a6..29864b24 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -35,6 +35,7 @@ commonSources := \ socket_loopback_client.c \ socket_loopback_server.c \ socket_network_client.c \ + sockets.c \ config_utils.c \ cpu_info.c \ load_file.c \ |