Elliott Hughes
310ecf1ae9
am 348adca2
: am be3db39e
: am 948acf71
: Merge "Switch back to OpenBSD inet_ntop now they\'re FORTIFY clean."
...
* commit '348adca20e68c42bdfbf594aaa675062d3595761':
Switch back to OpenBSD inet_ntop now they're FORTIFY clean.
2014-05-20 00:23:09 +00:00
Sreeram Ramachandran
7c30167b3a
am d70e0c88
: am 54c83fee
: am 9925c1a8
: Merge "Mark sockets on creation (socket()) and accept4()."
...
* commit 'd70e0c884c19c08aa44c038dbf2f12a5b55c73fe':
Mark sockets on creation (socket()) and accept4().
2014-05-20 00:23:03 +00:00
Ben Cheng
0d225606ec
am 10a1ecb4
: am d9798383
: am 77338a29
: Merge "Address additional warnings found by GCC 4.9."
...
* commit '10a1ecb4cbbc6a7236b12ad9c3dbc9b645091135':
Address additional warnings found by GCC 4.9.
2014-05-20 00:23:01 +00:00
Sreeram Ramachandran
59f3405d50
am f65c4db3
: am 1c99b23c
: am 172ab0f6
: Merge "Query libnetd_client for the appropriate netId for host resolution."
...
* commit 'f65c4db319feaeec844c8cf3f3eb920a134900e7':
Query libnetd_client for the appropriate netId for host resolution.
2014-05-20 00:23:00 +00:00
Elliott Hughes
348adca20e
am be3db39e
: am 948acf71
: Merge "Switch back to OpenBSD inet_ntop now they\'re FORTIFY clean."
...
* commit 'be3db39e213990af69a68f5070455a59775b24ee':
Switch back to OpenBSD inet_ntop now they're FORTIFY clean.
2014-05-19 23:26:23 +00:00
Elliott Hughes
be3db39e21
am 948acf71
: Merge "Switch back to OpenBSD inet_ntop now they\'re FORTIFY clean."
...
* commit '948acf710ed9be223696288466d4f4a566169ec5':
Switch back to OpenBSD inet_ntop now they're FORTIFY clean.
2014-05-19 23:22:21 +00:00
Elliott Hughes
948acf710e
Merge "Switch back to OpenBSD inet_ntop now they're FORTIFY clean."
2014-05-19 23:19:32 +00:00
Elliott Hughes
f51d3e8767
Switch back to OpenBSD inet_ntop now they're FORTIFY clean.
...
Change-Id: I04798a4966c352a8a12feebdff9646e3bad5933f
2014-05-19 15:55:29 -07:00
Sreeram Ramachandran
d70e0c884c
am 54c83fee
: am 9925c1a8
: Merge "Mark sockets on creation (socket()) and accept4()."
...
* commit '54c83feebfc3b2046ed9e060e19ba6793dec17c4':
Mark sockets on creation (socket()) and accept4().
2014-05-19 22:45:00 +00:00
Sreeram Ramachandran
54c83feebf
am 9925c1a8
: Merge "Mark sockets on creation (socket()) and accept4()."
...
* commit '9925c1a8f717b006b4245880c16f91e5f5f3b40a':
Mark sockets on creation (socket()) and accept4().
2014-05-19 22:42:30 +00:00
Sreeram Ramachandran
9925c1a8f7
Merge "Mark sockets on creation (socket()) and accept4()."
2014-05-19 22:39:05 +00:00
Ben Cheng
10a1ecb4cb
am d9798383
: am 77338a29
: Merge "Address additional warnings found by GCC 4.9."
...
* commit 'd979838321ffe232cd4b37d9b73ee2ec41e99850':
Address additional warnings found by GCC 4.9.
2014-05-19 22:34:25 +00:00
Ben Cheng
d979838321
am 77338a29
: Merge "Address additional warnings found by GCC 4.9."
...
* commit '77338a2969c4b5d6de5200c326ef67d6a82e95b2':
Address additional warnings found by GCC 4.9.
2014-05-19 22:30:09 +00:00
Ben Cheng
77338a2969
Merge "Address additional warnings found by GCC 4.9."
2014-05-19 22:28:10 +00:00
Sreeram Ramachandran
f65c4db319
am 1c99b23c
: am 172ab0f6
: Merge "Query libnetd_client for the appropriate netId for host resolution."
...
* commit '1c99b23cc1ff5f1de658d7377cedf6e43b20f39b':
Query libnetd_client for the appropriate netId for host resolution.
2014-05-19 22:23:55 +00:00
Sreeram Ramachandran
1c99b23cc1
am 172ab0f6
: Merge "Query libnetd_client for the appropriate netId for host resolution."
...
* commit '172ab0f65035013565ec57f52ece663082683698':
Query libnetd_client for the appropriate netId for host resolution.
2014-05-19 22:21:23 +00:00
Sreeram Ramachandran
903b78873a
Mark sockets on creation (socket()) and accept4().
...
Remove the separate syscall for accept() and implement it as accept4(..., 0).
Change-Id: Ib0b8f5d7c5013b91eae6bbc3847852eb355c7714
2014-05-19 15:19:16 -07:00
Sreeram Ramachandran
172ab0f650
Merge "Query libnetd_client for the appropriate netId for host resolution."
2014-05-19 22:16:47 +00:00
Ben Cheng
caff5f2e1a
Address additional warnings found by GCC 4.9.
...
Change-Id: If668a6eb98a6ce7b2872f528b8e3527638814f68
2014-05-19 14:27:31 -07:00
Paul Jensen
5240b562e7
Query libnetd_client for the appropriate netId for host resolution.
...
If libnetd_client can't be found, operate as before and use the default netId
potentially overriden by a more specific netId passed in to
android_get*fornet().
(cherry picked from commit 559c7842cc
)
Change-Id: I42ef3293172651870fb46d2de22464c4f03e8e0b
2014-05-19 12:49:52 -07:00
Sreeram Ramachandran
57a2627575
Fix build breakage.
...
Change-Id: I1835198c64c28021b81f0c790f108685a3f456c7
2014-05-19 10:21:39 -07:00
Sreeram Ramachandran
7fe1063797
resolved conflicts for merge of e7329284
to master
...
Change-Id: Iaeb09451ed1a268a025ce3033ab018f28f954848
2014-05-19 09:57:54 -07:00
Sreeram Ramachandran
e732928425
am 0617c73f
: am 308c30af
: Merge "Cosmetic changes to netd client files."
...
* commit '0617c73f918ccfa5b836e1ae11c06a060f447469':
Cosmetic changes to netd client files.
2014-05-19 16:52:14 +00:00
Sreeram Ramachandran
0617c73f91
am 308c30af
: Merge "Cosmetic changes to netd client files."
...
* commit '308c30af72da7b13938934ba5037dd347b1ef139':
Cosmetic changes to netd client files.
2014-05-19 16:48:50 +00:00
Sreeram Ramachandran
308c30af72
Merge "Cosmetic changes to netd client files."
2014-05-19 16:45:53 +00:00
Paul Jensen
559c7842cc
Query libnetd_client for the appropriate netId for host resolution.
...
If libnetd_client can't be found, operate as before and use the default netId
potentially overriden by a more specific netId passed in to
android_get*fornet().
Change-Id: I42ef3293172651870fb46d2de22464c4f03e8e0b
2014-05-19 11:23:12 +00:00
Christopher Ferris
bf701a1a92
am 1937b329
: am 8fccb27f
: am 3a757f40
: Merge "Accuracy tests for libm"
...
* commit '1937b329604a19abc85bbd252cf1e7d49ca980f0':
Accuracy tests for libm
2014-05-19 02:29:40 +00:00
Christopher Ferris
1937b32960
am 8fccb27f
: am 3a757f40
: Merge "Accuracy tests for libm"
...
* commit '8fccb27f951a9c790a92dc4619fef744c59aba9e':
Accuracy tests for libm
2014-05-19 02:26:57 +00:00
Christopher Ferris
8fccb27f95
am 3a757f40
: Merge "Accuracy tests for libm"
...
* commit '3a757f403ba98ab2132ceb8d290dfafea6c4c7a5':
Accuracy tests for libm
2014-05-19 02:23:16 +00:00
Christopher Ferris
3a757f403b
Merge "Accuracy tests for libm"
2014-05-19 02:19:58 +00:00
Sreeram Ramachandran
72c53933f8
Cosmetic changes to netd client files.
...
+ Name the dispatch header correctly (NetdClientDispatch.h).
+ Hide the global dispatch variable (__netdClientDispatch).
+ Explain why it's okay to read the variable without locking.
+ Use quotes instead of angle-brackets for non-system includes.
+ Add necessary declarations for C compiles (and not just C++).
Change-Id: Id0932165e71d81da5fce77a684f40c2263f58e61
2014-05-18 15:18:36 -07:00
Elliott Hughes
de546168fc
am ad064403
: am 6e37ebfe
: am 6c83305c
: Merge "Rethrow SIGTRAP too."
...
* commit 'ad064403363cf1cafc497ef8a086184318d5e6cf':
Rethrow SIGTRAP too.
2014-05-17 00:42:52 +00:00
Elliott Hughes
ad06440336
am 6e37ebfe
: am 6c83305c
: Merge "Rethrow SIGTRAP too."
...
* commit '6e37ebfe5cb037bba00967d4b3e891c122ec4904':
Rethrow SIGTRAP too.
2014-05-17 00:40:39 +00:00
Elliott Hughes
6e37ebfe5c
am 6c83305c
: Merge "Rethrow SIGTRAP too."
...
* commit '6c83305c9a0c43eff407f3b4a2ff10ad0be26f01':
Rethrow SIGTRAP too.
2014-05-17 00:38:01 +00:00
Elliott Hughes
6c83305c9a
Merge "Rethrow SIGTRAP too."
2014-05-17 00:35:34 +00:00
Elliott Hughes
00c855eb3d
Rethrow SIGTRAP too.
...
Bug: 15024256
Change-Id: I0347da9698a6ccd317ce6e6f7916d710d66e0f8a
2014-05-16 17:34:13 -07:00
Elliott Hughes
3810729e54
am 91a7e878
: am 81e4ab45
: am 8b9a22f3
: Merge "Fix the newly-introduced warning and turn on -Werror."
...
* commit '91a7e878f22776c8b15fb1aceb4823718611fe12':
Fix the newly-introduced warning and turn on -Werror.
2014-05-17 00:23:14 +00:00
Elliott Hughes
92fd345436
am 0a26974e
: am dc9ac844
: am 2071b983
: Merge "debugger.cpp should know the names of the signals it catches."
...
* commit '0a26974e5291a56bdd06a8b0bb25101dde408181':
debugger.cpp should know the names of the signals it catches.
2014-05-17 00:23:14 +00:00
Elliott Hughes
91a7e878f2
am 81e4ab45
: am 8b9a22f3
: Merge "Fix the newly-introduced warning and turn on -Werror."
...
* commit '81e4ab453a43fc490205cc42d0be391495fe9686':
Fix the newly-introduced warning and turn on -Werror.
2014-05-17 00:19:59 +00:00
Elliott Hughes
0a26974e52
am dc9ac844
: am 2071b983
: Merge "debugger.cpp should know the names of the signals it catches."
...
* commit 'dc9ac8449cee4d6ddb9afa57c730e8b3aedb83a5':
debugger.cpp should know the names of the signals it catches.
2014-05-17 00:19:59 +00:00
Elliott Hughes
81e4ab453a
am 8b9a22f3
: Merge "Fix the newly-introduced warning and turn on -Werror."
...
* commit '8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5':
Fix the newly-introduced warning and turn on -Werror.
2014-05-17 00:17:06 +00:00
Elliott Hughes
dc9ac8449c
am 2071b983
: Merge "debugger.cpp should know the names of the signals it catches."
...
* commit '2071b98341915dbf63d222539c455f1d60e1a233':
debugger.cpp should know the names of the signals it catches.
2014-05-17 00:17:05 +00:00
Elliott Hughes
8b9a22f30a
Merge "Fix the newly-introduced warning and turn on -Werror."
2014-05-17 00:16:05 +00:00
Elliott Hughes
2071b98341
Merge "debugger.cpp should know the names of the signals it catches."
2014-05-17 00:14:46 +00:00
Elliott Hughes
62e35755eb
debugger.cpp should know the names of the signals it catches.
...
Change-Id: I37908b07739ad465652f143848c52bc1ef19e421
2014-05-16 16:59:54 -07:00
Elliott Hughes
4c2da039ba
Fix the newly-introduced warning and turn on -Werror.
...
I cleaned up most of our warnings last week but forgot to turn on -Werror,
so of course we're getting new warnings already. I've left -Werror commented
out in those places where we still have warnings to deal with before we can
turn on -Werror.
Change-Id: Ia58ff8b8c1ada4bf81eec6f19ec1d34e133cf4b1
2014-05-16 16:50:34 -07:00
Elliott Hughes
0f43d02843
am 19a54ce4
: am 88a8e09b
: am 5e6e3edb
: Merge "Export get_malloc_leak_info and free_malloc_leak_info, used by ddms."
...
* commit '19a54ce4d446cdea01a7d50c2951481f3ed006bd':
Export get_malloc_leak_info and free_malloc_leak_info, used by ddms.
2014-05-16 23:40:25 +00:00
Elliott Hughes
19a54ce4d4
am 88a8e09b
: am 5e6e3edb
: Merge "Export get_malloc_leak_info and free_malloc_leak_info, used by ddms."
...
* commit '88a8e09bcf1bd498afbf4104c8a6a46ac76b4625':
Export get_malloc_leak_info and free_malloc_leak_info, used by ddms.
2014-05-16 23:36:50 +00:00
Elliott Hughes
88a8e09bcf
am 5e6e3edb
: Merge "Export get_malloc_leak_info and free_malloc_leak_info, used by ddms."
...
* commit '5e6e3edbba20bf5a166ea9d06a8f2f38a40e122f':
Export get_malloc_leak_info and free_malloc_leak_info, used by ddms.
2014-05-16 23:33:54 +00:00
Elliott Hughes
f4ad3d6dd7
am b95ce9b3
: am 838c5c25
: am a23ee2cf
: Merge "Hide _exit_with_stack_teardown."
...
* commit 'b95ce9b3d7b94878cb1a42e19cf059ad4d1455e8':
Hide _exit_with_stack_teardown.
2014-05-16 23:33:44 +00:00