Commit graph

3828 commits

Author SHA1 Message Date
Jeff Brown
33563c4482 am 5b878d24: Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
* commit '5b878d24c1f01a5f131d470280b51bcfb5638600':
  Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
2012-05-09 01:48:45 -07:00
Jeff Brown
82ebb15881 am bff8f3fa: Add stubs for host builds.
* commit 'bff8f3fa9848e52e3f3fe773796a03a80133992a':
  Add stubs for host builds.
2012-05-09 01:48:45 -07:00
Jeff Brown
2f70edf80a am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
* commit '796a85e24511b7926a1fccb7cc695900d3ce0922':
  Revert "Use O_CLOEXEC when opening cgroup fds."
2012-05-09 01:48:25 -07:00
Jeff Brown
295afb36b5 am 6bdc0ca8: Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev
* commit '6bdc0ca86acd8a50de2df9433a195baefce2b3a7':
  Use O_CLOEXEC when opening cgroup fds.
2012-05-09 01:48:08 -07:00
Jeff Brown
5b878d24c1 Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
This reverts commit 4df54bc4a8.
2012-05-08 15:07:58 -07:00
Jeff Brown
bff8f3fa98 Add stubs for host builds.
Bug: 4466013
Change-Id: I5633c841e71a48357bb04cd7ccc02550c17bde22
2012-05-08 15:07:32 -07:00
Jeff Brown
796a85e245 Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev 2012-05-08 14:59:31 -07:00
Jeff Brown
4df54bc4a8 Revert "Use O_CLOEXEC when opening cgroup fds."
This reverts commit e1440d81ae
2012-05-08 14:58:30 -07:00
Jeff Brown
6bdc0ca86a Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev 2012-05-08 13:59:05 -07:00
Jeff Brown
e1440d81ae Use O_CLOEXEC when opening cgroup fds.
Bug: 4466013
Change-Id: I0d2e915fc550a0ecaccad5e452dd4c87fc878b8b
2012-05-08 13:41:10 -07:00
The Android Automerger
d8d410d1b5 merge in jb-release history after reset to jb-dev 2012-05-08 08:26:24 -07:00
JP Abgrall
30ae5806e9 fastboot: Change -w to format after the erase of userdata & cache
If the bootloader doesn't support formatting of those partitions
(either because it doesn't support the getvar commands needed or
the partition type is not supported), the errors are printed but
doesn't halt processing of subsequent commands.

Change-Id: I816ac2e5e7593846fcb4fd39c793a8dbdd996f6f
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-05-07 20:25:24 -07:00
Doug Zongker
0e6056d012 change /fstab.* perms to 0640
It's safe to change the permissions on files in the root partitions;
incremental OTA now knows how to handle this case.

This reverts commit 08c370cc50.

Change-Id: I503bf8ebd037fa9715494c6539e5430eee47acfe
2012-05-07 16:49:24 -07:00
Colin Cross
40b2d79a40 am 0e92b50f: Merge "libsuspend: create new library to handle triggering suspend" into jb-dev
* commit '0e92b50f0fb432c45b26863394e473916b0ab4ef':
  libsuspend: create new library to handle triggering suspend
2012-05-07 16:02:14 -07:00
Colin Cross
0e92b50f0f Merge "libsuspend: create new library to handle triggering suspend" into jb-dev 2012-05-07 16:00:19 -07:00
Colin Cross
a2582c2c4d libsuspend: create new library to handle triggering suspend
libsuspend provides functions autosuspend_enable() and
autosuspend_disable() to trigger suspend on a variety of different
kernels.

Change-Id: I5dc28fb51532fa7c514330f1cfde7698d31d734c
2012-05-07 15:33:34 -07:00
Jamie Gennis
d21113ac46 ANativeWindow: add set_post_transform_crop
This change replaces the set_active_rect function with set_post_transform_crop.
There is a temporary set_active_rect function that calls
set_post_transform_crop for compatibility while commiting to multiple git
repositories.

Change-Id: Ia7c171186fd277d5a36f6068ace93a9ce1c82d28
2012-05-07 14:21:46 -07:00
Jean-Baptiste Queru
2f1d4e2d2d am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"
* commit '254e0d496e11b30cd9e4f9324f3514be7e85f6d4':
  init: Fix chown and chmod for write-only files
2012-05-06 15:32:47 -07:00
Jean-Baptiste Queru
254e0d496e am d98c87c9: Merge "init: Fix chown and chmod for write-only files"
* commit 'd98c87c95342ed6eade9f1239122dc9e90dcad67':
  init: Fix chown and chmod for write-only files
2012-05-06 15:29:18 -07:00
The Android Automerger
eb62bc81eb merge in jb-release history after reset to jb-dev 2012-05-06 14:22:11 -07:00
Jean-Baptiste Queru
d98c87c953 Merge "init: Fix chown and chmod for write-only files" 2012-05-06 08:08:43 -07:00
Tanguy Pruvot
0ffc5b37e5 toolbox: implement rm -f flag
this prevent compatibility errors in scripts (file "-f" not found)
The force flag will not return an error if the file doesnt exist.

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68
2012-05-06 02:36:00 +02:00
Doug Zongker
f3772351e7 am a865f6d8: fix mkbootfs for systems that lack PATH_MAX
* commit 'a865f6d85a52d0a77d1aef8d5fb5bece08e3b246':
  fix mkbootfs for systems that lack PATH_MAX
2012-05-04 17:00:01 -07:00
Doug Zongker
a865f6d85a fix mkbootfs for systems that lack PATH_MAX
Change-Id: I1b841bde6de6c8e762c5fba35e6d6d701f18bb05
2012-05-04 16:45:35 -07:00
Doug Zongker
4d755a1b37 am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
* commit '0375fd133a95f47d0ea12b16ca3d7ccf04ea6362':
  add -f option to mkbootfs to load file perms from file
2012-05-04 16:31:57 -07:00
Doug Zongker
0375fd133a Merge "add -f option to mkbootfs to load file perms from file" into jb-dev 2012-05-04 16:29:45 -07:00
Benoit Goby
93574c619c init: Fix chown and chmod for write-only files
Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
2012-05-04 16:29:41 -07:00
The Android Automerger
af24f60e32 merge in jb-release history after reset to jb-dev 2012-05-04 16:17:46 -07:00
Doug Zongker
f2c3a8331c add -f option to mkbootfs to load file perms from file
mkbootfs uses the compiled in fs_config() function to set the mode
(but not the uid or gid) of the files in the filesystem it is
building.  Give it an optional "-f filename" flag to allow loading the
list of file permissions from a file, so we can continue to accurately
recreate old filesystems even when the current fs_config() has changed.

Bug: 6435132
Change-Id: Ife6b25e989301e78e22c34a544738436c96caf6f
2012-05-04 16:00:23 -07:00
Elliott Hughes
34d85c5e6c am f82e7411: Make a liblog.so for the host too.
* commit 'f82e74116314c4def32013495337c038f6c6ee6c':
  Make a liblog.so for the host too.
2012-05-03 16:36:13 -07:00
Elliott Hughes
f82e741163 Make a liblog.so for the host too.
Change-Id: I0317bb3b80c6555bcb1ff9f2238f32be5f7adedb

Conflicts:

	liblog/Android.mk
2012-05-03 16:04:57 -07:00
Todd Poynor
4ff10e63c3 init: Set perms for interactive cpufreq governor boostpulse
Change-Id: Ia4b028f58f9d48bad2525744497f10884d11c5d6
2012-05-03 15:20:48 -07:00
Doug Zongker
350046ef88 change /fstab.* perms back to 0644, to unbreak incremental OTAs
Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84
2012-05-03 14:59:25 -07:00
Doug Zongker
e8b2e6185c am 08c370cc: change /fstab.* perms back to 0644, to unbreak incremental OTAs
* commit '08c370cc50e4bdae5a59f4ddfd1e3874bb36579d':
  change /fstab.* perms back to 0644, to unbreak incremental OTAs
2012-05-03 14:21:33 -07:00
Doug Zongker
08c370cc50 change /fstab.* perms back to 0644, to unbreak incremental OTAs
Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84
2012-05-03 14:16:54 -07:00
The Android Automerger
668ed7a512 merge in jb-release history after reset to jb-dev 2012-05-03 07:21:16 -07:00
Jeff Sharkey
8f1d4daffd am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev
* commit '982fd17ac179787ca5f7a7ece03234629285850f':
  Support full 32 bits for socket tags.
2012-05-02 19:39:44 -07:00
Jeff Sharkey
982fd17ac1 Merge "Support full 32 bits for socket tags." into jb-dev 2012-05-02 19:37:27 -07:00
Jeff Sharkey
e34b91719c Support full 32 bits for socket tags.
Bug: 5321184
Change-Id: Iabd668674e60626caafc9b66b29fdbddc3724f58
2012-05-02 16:01:31 -07:00
Nick Kralevich
a6e861658b am f490b56c: (-s ours) am 09a96bef: Merge "init: make chmod/mkdir/chown not follow symlinks"
* commit 'f490b56c61df016f6572fc002cbb4f18660e4e01':
  init: make chmod/mkdir/chown not follow symlinks
2012-05-02 15:17:38 -07:00
Dima Zavin
37fe6081fb am 8be310c2: am 29fea7b1: Merge "Added missing header to window.h"
* commit '8be310c21374013e398705418638509bc0efd32a':
  Added missing header to window.h
2012-05-02 15:11:09 -07:00
Jean-Baptiste Queru
007b70023b am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"
* commit '2ae9878cd5dc517cc7338aaca81f0eb3127b4a53':
  Kindle Fire USB ID
2012-05-02 15:11:08 -07:00
Nick Kralevich
f490b56c61 am 09a96bef: Merge "init: make chmod/mkdir/chown not follow symlinks"
* commit '09a96bef654d58d5100353a1aa7239aae12d9bf3':
  init: make chmod/mkdir/chown not follow symlinks
2012-05-02 11:58:11 -07:00
Dima Zavin
8be310c213 am 29fea7b1: Merge "Added missing header to window.h"
* commit '29fea7b17a35390e9a463079936bb8c20bcb1a15':
  Added missing header to window.h
2012-05-02 11:58:10 -07:00
Jean-Baptiste Queru
2ae9878cd5 am c5d5a5e8: Merge "Kindle Fire USB ID"
* commit 'c5d5a5e807a99697cff936dcdfe0fbaaf3cb6679':
  Kindle Fire USB ID
2012-05-02 11:58:10 -07:00
Nick Kralevich
09a96bef65 Merge "init: make chmod/mkdir/chown not follow symlinks" 2012-05-02 11:34:28 -07:00
Geremy Condra
42a9349dc4 init: make chmod/mkdir/chown not follow symlinks
This change brings init's do_chmod, mkdir, and do_chown into line
with open's O_NOFOLLOW semantics, causing them to fail when the
last element of their target path is a symlink.

Change-Id: If00e1a25cfe17ef6f738af4bf0541abd0c1b084b
2012-05-02 11:13:49 -07:00
Dima Zavin
29fea7b17a Merge "Added missing header to window.h" 2012-05-02 09:08:06 -07:00
Jean-Baptiste Queru
c5d5a5e807 Merge "Kindle Fire USB ID" 2012-05-02 09:07:25 -07:00
The Android Automerger
90392a3aa9 merge in jb-release history after reset to jb-dev 2012-05-02 07:13:50 -07:00