Commit graph

7351 commits

Author SHA1 Message Date
Elliott Hughes
ed02fbf05c Merge "Clean up some unnecessary system_properties cruft." 2014-05-14 23:59:27 +00:00
Elliott Hughes
f94853f294 Clean up some unnecessary system_properties cruft.
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
2014-05-14 16:51:09 -07:00
Sreeram Ramachandran
f03397fad4 Merge changes If5359c26,I5d09be41
* changes:
  Use a function instead of a macro.
  Mark sockets on accept().
2014-05-14 19:41:45 +00:00
Sreeram Ramachandran
7516148597 Merge "Introduce netd_client, a dynamic library that talks to netd." 2014-05-14 19:41:39 +00:00
Sreeram Ramachandran
09eaad793a Merge "Introduce fwmarkd: a service to set the fwmark of sockets." 2014-05-14 19:41:33 +00:00
Sreeram Ramachandran
6af621f792 Use a function instead of a macro.
(cherry picked from commit f3e4a8bb245afe874561eb7275f49dae0e7e55dd)

Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
2014-05-14 11:15:20 -07:00
Sreeram Ramachandran
b87b17a895 Mark sockets on accept().
(cherry picked from commit 1321cfecc6fb0e075796a34ed3c6a30d7ff3bea3)

Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
2014-05-14 11:14:41 -07:00
Sreeram Ramachandran
154ebe80a0 Introduce netd_client, a dynamic library that talks to netd.
This library is dynamically loaded and used by bionic, to replace selected
standard socket syscalls with versions that talk to netd.

Implement connect() by requesting that the socket be marked with the netId of
the default network and then calling through to the actual syscall.

There are two escape hatches:

+ If the fwmark server is unavailable, it isn't an error; we proceed with the
  syscall. This might help at boot time (when the server isn't ready yet) and if
  we get rid of the fwmarkd socket entirely in future platform versions.

+ If the ANDROID_NO_USE_FWMARK_CLIENT environment variable is set, we don't
  attempt to use the fwmark server (even if it's available). This allows apps to
  sidestep unforseen issues in production at runtime.

(cherry picked from commit 0581cb455ef924f128a5c6d46bc70868b5099eec)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:13:53 -07:00
Sreeram Ramachandran
e38d470714 Introduce fwmarkd: a service to set the fwmark of sockets.
(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)

Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 11:12:42 -07:00
Mark Salyzyn
3fe8afa404 Merge "fastboot: turn on -Werror" 2014-05-14 18:04:11 +00:00
Mark Salyzyn
506a536b1e Merge "libzipfile: turn on -Werror" 2014-05-14 18:03:53 +00:00
Mark Salyzyn
5957c1ffe7 fastboot: turn on -Werror
- Deal with a missing initializer issue
- Deal with some -Wunused issues
- Deal with some signed/unsigned issues
- switch to usleep from sleep to facilitate win_sdk compile

Change-Id: I64e32a5b0782aeed9582f489e866173c4df1afbf
2014-05-14 08:33:56 -07:00
Mark Salyzyn
ab886745bc libzipfile: turn on -Werror
- resolve some unused references

Change-Id: Ia3748c7e25963c2fd3d58e175177f0f4dd405997
2014-05-14 08:33:55 -07:00
Sreeram Ramachandran
32e4479d55 Merge "Set kernel proc files for fwmark reflection and table numbers for RAs." 2014-05-13 22:29:34 +00:00
Sreeram Ramachandran
fd94922329 Set kernel proc files for fwmark reflection and table numbers for RAs.
(cherry picked from commit 2c2807ac1041751583e0c3b6892ca56eae423fa2)

Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
2014-05-13 13:02:44 -07:00
Kenny Root
905874abe4 Merge "adb: avoid compilation errors for unused results" 2014-05-13 16:17:17 +00:00
Kenny Root
1bd41b1399 adb: avoid compilation errors for unused results
The BIO_CTRL_FLUSH function for files doesn't return anything useful
from the underlying fflush call, so it is safe to ignore this.

Change-Id: If33a7efbbaaf158e3da1cd72d0a56da1d3b82fd9
2014-05-13 09:12:54 -07:00
Ian Rogers
09b84870d5 Merge "Remove declaration of unused static variable" 2014-05-12 22:22:24 +00:00
Bernhard Rosenkraenzer
7fb0844174 Remove declaration of unused static variable
The declaration is useless and triggers a warning with clang 3.5 (in
code that's built with -Werror)

Change-Id: I8fc42178df264509dcce6e1f1ba318bf849307e3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-05-12 17:47:39 +02:00
Christopher Ferris
9428a2898c Merge "Only include ucontext.h when necessary." 2014-05-10 00:15:11 +00:00
Christopher Ferris
c58287d601 Only include ucontext.h when necessary.
Change-Id: I29014f6c6b82e0a9797e5d76147b3c4e3d82a7f5
2014-05-09 16:59:06 -07:00
Christopher Ferris
b49f23ed31 Merge "Fix ucontext_t forward declare for mac." 2014-05-09 20:54:29 +00:00
Christopher Ferris
afa9c9cd72 Fix ucontext_t forward declare for mac.
Change-Id: I30470f5cc25553dee25d4858f64ec5af13aa20c9
2014-05-09 13:19:34 -07:00
Christopher Ferris
bf6c2dbef5 Merge "Fix mac build." 2014-05-09 18:13:06 +00:00
Christopher Ferris
b138037b26 Fix mac build.
Forward declare ucontext_t so that it's not necessary for ucontext.h
to be included in the global header.

Change-Id: Ic13677dd572ab1acd927f0a17b284f9b417a642f
2014-05-09 11:04:09 -07:00
Christopher Ferris
3a088524cb Merge "Rewrite unwind thread handling." 2014-05-09 16:33:12 +00:00
JP Abgrall
dc0ea8626f Merge "libziparchive: off64_t is not int64_t (part deux)" 2014-05-09 02:23:40 +00:00
Mark Salyzyn
96c5c99bda libziparchive: off64_t is not int64_t (part deux)
Change-Id: I38e78bdba338a0c40aec43d6c86f26f388cee6ab
2014-05-08 19:16:40 -07:00
JP Abgrall
f304730c28 Merge "libziparchive: off64_t is not int64_t" 2014-05-09 00:26:25 +00:00
Mark Salyzyn
56a90a08db libziparchive: off64_t is not int64_t
- ToDo: investigate why our system headers let us down.

Change-Id: Iada422adbbbd4fbd0fc09b51b97b3cd06ccc6374
2014-05-08 17:20:55 -07:00
Mark Salyzyn
9b5f044fd0 Merge "libziparchive: 64 bit issues" 2014-05-08 23:14:36 +00:00
Mark Salyzyn
088bf90e5d libziparchive: 64 bit issues
Change-Id: I1b53aff5b1527a3623d17deed306624707d345ef
2014-05-08 16:06:54 -07:00
Christopher Ferris
a2efd3ac7a Rewrite unwind thread handling.
This new version doesn't require any specialized thread
implementation, it uses the Current implementation to do its job.
In addition, it runs much faster when multiple threads are trying
to unwind at the same time since the global signal lock is held for
only a small amount of time. Even running through the threads one at
a time should be faster since it no longer requires two passes through
the unwound stacks.

The new code now allows multiple simultaneous unwinds of the
same thread.

Finally, add the ability to unwind from a ucontext_t passed in. This
functionality doesn't work for remote unwinds yet.

Change-Id: I4d181d7ca5ffd2acfd1686e668e6d21e36b425cb
2014-05-08 14:42:16 -07:00
Mark Salyzyn
113067e216 Merge "run-as: build 1161573 failure" 2014-05-08 21:21:33 +00:00
Mark Salyzyn
2e6e2713fb run-as: build 1161573 failure
- pointer to integer comparison.

Change-Id: I4a12c357ff5eaf2fc08c19c9efe7e2d7cb0dbe2e
2014-05-08 21:18:23 +00:00
Mark Salyzyn
a2b03c4a6a Merge "libsparse: turn on -Werror" 2014-05-08 20:32:37 +00:00
Mark Salyzyn
01ef52e114 Merge "fs_mgr: turn on -Werror" 2014-05-08 20:31:11 +00:00
Mark Salyzyn
d3d8703c8a Merge "libmincrypt: suppress warning messages" 2014-05-08 20:30:47 +00:00
Mark Salyzyn
b9b50b4e58 Merge "libziparchive: Turn on -Werror" 2014-05-08 20:30:20 +00:00
Mark Salyzyn
17151e4d0e Merge "run-as: turn on -Werror" 2014-05-08 20:29:39 +00:00
Mark Salyzyn
9318e4d9f8 Merge "liblog: set -Werror" 2014-05-08 20:29:16 +00:00
Mark Salyzyn
8116c8c37a libsparse: turn on -Werror
- Deal with some -Wunused issues

Change-Id: I9667d74c0dfbe55c625e65b9d44d7c6f861c455d
2014-05-07 16:56:22 -07:00
Mark Salyzyn
86e3f22b6a fs_mgr: turn on -Werror
- deal with some -Wunused-variable issues

Change-Id: Ie0140d4777ddf862e4bbed76142a1dbb8320c1b0
2014-05-07 16:56:21 -07:00
Mark Salyzyn
f03f8485e7 libmincrypt: suppress warning messages
- deal with implict declaration issue
- deal with some -Wunused issues

Change-Id: I253f1412a696c4811ade70a931fb1c01b31c62a5
2014-05-07 16:56:21 -07:00
Mark Salyzyn
51d562d399 libziparchive: Turn on -Werror
Change-Id: I98a93273b9e1bac0324dd210f6a8493ba780e878
2014-05-07 16:56:21 -07:00
Mark Salyzyn
b9f5a2b9a0 run-as: turn on -Werror
- remove an abandoned code fragment

Change-Id: I32d4ad820772685c680d200dc00ef11d102c76bd
2014-05-07 16:56:21 -07:00
Mark Salyzyn
a04464adaf liblog: set -Werror
- Deal with some -Wunused issues
- Cleanup UNUSED to __unused transition

Change-Id: Icd33808d4c974625f4fd0a126a90a2b4c90c8314
2014-05-07 16:56:21 -07:00
Alexander Levitskiy
d150618d8d Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup."" 2014-05-07 23:37:20 +00:00
Alexander Levitskiy
8d7ddb35d5 Revert "System: Fastboot: warning fixit, misc bugs and cleanup."
This reverts commit 782111b3bc.

Change-Id: Ib66400dfaeef7f01e6461a57b9f09be08de2f1fe
2014-05-07 23:31:59 +00:00
Mark Salyzyn
129e9dada7 Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb
* changes:
  adb: turn on -Werror
  netcfg: turn on -Werror
  mkbootimg: turn on -Werror
  gpttool: turn on -Werror
2014-05-07 23:10:40 +00:00