Paul Lawrence
c410b3bd63
Revert "Revert "Adding e4crypt support""
...
Fix build break caused by original change
This reverts commit 84b0bab58f
.
(cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c)
Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
2015-04-01 13:48:06 -07:00
Jeff Sharkey
fc0004894a
Progress towards dynamic storage support.
...
To support external storage devices that are dynamically added and
removed at runtime, we're changing /mnt and /storage to be tmpfs that
are managed by vold.
To support primary storage being inserted/ejected at runtime in a
multi-user environment, we can no longer bind-mount each user into
place. Instead, we have a new /storage/self/primary symlink which
is resolved through /mnt/user/n/primary, and which vold updates at
runtime.
Fix small mode bugs in FUSE daemon so it can be safely mounted
visible to all users on device.
Bug: 19993667
Change-Id: I0ebf4d10aba03d73d9a6fa37d4d43766be8a173b
2015-03-30 19:48:38 -07:00
Tao Bao
c9eccaa58b
am b17b9921: am e9c2a4a0: am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'b17b9921c7d71b05ec29505d7a4671a8c771723f':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:43:30 +00:00
Tao Bao
b17b9921c7
am e9c2a4a0: am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'e9c2a4a0a4ba2059f313da5c686217cbbd62278f':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:10:42 +00:00
Tao Bao
e9c2a4a0a4
am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'cd153076dc27b9a53fddec35eb050f44239d5af3':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:03:31 +00:00
Elliott Hughes
e19143a7cb
am 4bd43889: am 656957e8: am a58c0b5f: Merge "Build init with clang."
...
* commit '4bd43889c9aedfaff093ca81bca7c7b81b3061f0':
Build init with clang.
2015-03-31 01:00:53 +00:00
Tao Bao
cd153076dc
Merge "adb: Add option to reboot into sideload mode in recovery"
2015-03-31 00:57:33 +00:00
Elliott Hughes
4bd43889c9
am 656957e8: am a58c0b5f: Merge "Build init with clang."
...
* commit '656957e814a157538d748972573a9100b4261b81':
Build init with clang.
2015-03-31 00:48:34 +00:00
Elliott Hughes
656957e814
am a58c0b5f: Merge "Build init with clang."
...
* commit 'a58c0b5f12d60a3ae62cca57192cd0c3d9416f49':
Build init with clang.
2015-03-31 00:41:54 +00:00
Elliott Hughes
a58c0b5f12
Merge "Build init with clang."
2015-03-31 00:35:20 +00:00
Tao Bao
175b7bbfb4
adb: Add option to reboot into sideload mode in recovery
...
Currently it requires manual key press to enter the sideload mode. This
CL adds 'adb reboot sideload' to reboot the device into sideload mode
directly with text display on. With 'adb reboot sideload-auto-reboot',
it will reboot after the sideload regardless of the installation result,
unless interrupted by user.
Since it needs to write to /cache/recovery/command file, 'adb root' is
required before calling 'adb reboot sideload' and the one with
'-auto-reboot'.
Also it requires the matching CL in bootable/recovery.
Change-Id: Ib7bd4e216a1efc01e64460659c97c6005bbaec1b
2015-03-31 00:19:52 +00:00
Elliott Hughes
9efd95b029
Build init with clang.
...
Change-Id: I14d95b3fe0505dd7d7632e2eedc537f97553c715
2015-03-30 14:37:11 -07:00
Elliott Hughes
18eba75e6f
am 7f9bc931: am 1f9a2288: am ffa85da6: Merge "Lose route to toybox."
...
* commit '7f9bc9310f522858ff89e221a4f8d00845c66024':
Lose route to toybox.
2015-03-30 21:24:01 +00:00
Elliott Hughes
7f9bc9310f
am 1f9a2288: am ffa85da6: Merge "Lose route to toybox."
...
* commit '1f9a22882f4fa0a0714b51904c264279bf1a5dbd':
Lose route to toybox.
2015-03-30 21:10:47 +00:00
Elliott Hughes
1f9a22882f
am ffa85da6: Merge "Lose route to toybox."
...
* commit 'ffa85da6125c4b820fdecfd2b49acfb2631fb07a':
Lose route to toybox.
2015-03-30 21:04:02 +00:00
Elliott Hughes
ffa85da612
Merge "Lose route to toybox."
2015-03-30 20:57:56 +00:00
Elliott Hughes
af8e63fa17
am 958af99e: am 42997bfe: am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit '958af99e0e26af7267828020b73903a054855525':
Always unlink /dev/__kmsg__.
2015-03-30 19:39:02 +00:00
Elliott Hughes
958af99e0e
am 42997bfe: am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit '42997bfebcd3e93265feae74e2194793549fedc5':
Always unlink /dev/__kmsg__.
2015-03-30 19:25:05 +00:00
Elliott Hughes
42997bfebc
am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit 'eb809351db938f4e99aad36a9e791c4b87b0c951':
Always unlink /dev/__kmsg__.
2015-03-30 19:18:50 +00:00
Elliott Hughes
eb809351db
Merge "Always unlink /dev/__kmsg__."
2015-03-30 19:12:47 +00:00
Dan Albert
9e03795486
am 7ad86670: am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '7ad8667042751451a8a986df86f1470ac29dccc9':
Enable building libbase on Windows.
2015-03-30 18:46:43 +00:00
Elliott Hughes
55ca889052
am 3e46f4af: am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit '3e46f4af4f52aee324601b449abf9219bfd6b362':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 18:46:42 +00:00
Dan Albert
7ad8667042
am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '20329fa4274128beadd1dde04edd26478673f116':
Enable building libbase on Windows.
2015-03-30 18:36:36 +00:00
Elliott Hughes
3e46f4af4f
am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit '9c39510e06f36b9c03b61f4eefae521991daead6':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 18:32:30 +00:00
Elliott Hughes
798ec0c39d
Lose route to toybox.
...
Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
2015-03-30 11:23:44 -07:00
Dan Albert
20329fa427
am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '6d457fe1a8f35c50c84f523846f0f1aa04491423':
Enable building libbase on Windows.
2015-03-30 17:51:34 +00:00
Dan Albert
6d457fe1a8
Merge "Enable building libbase on Windows."
2015-03-30 17:47:03 +00:00
Dan Albert
b2326bd56c
Enable building libbase on Windows.
...
We have to exclude the logging facilities for now (since we don't have
a std::mutex on Windows), but there's plenty else in here that is
worth having.
Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
2015-03-30 10:30:42 -07:00
Elliott Hughes
9c39510e06
am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit 'c2d9cc85766bbec22980021af4eb4b01200c9a9f':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 17:28:33 +00:00
Elliott Hughes
c2d9cc8576
Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
2015-03-30 17:18:51 +00:00
Johan Redestig
c06541912d
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
...
ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).
Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
2015-03-30 10:17:29 -07:00
Tim Kilbourn
02fedb153d
Merge "Use eventfd instead of pipe in Looper."
2015-03-30 17:04:52 +00:00
Elliott Hughes
d5f68ea23f
am 12137b3e: am 9e0edb77: am 934102ba: Merge "Lose load_policy to toybox."
...
* commit '12137b3ef052b9343e6ccc9d52d7c74ef45f48e6':
Lose load_policy to toybox.
2015-03-28 20:59:41 +00:00
Elliott Hughes
a3c9f8fa35
am 2ca681c4: am 1108b42a: am 48402951: Merge "Clarify a few things about bootcharts."
...
* commit '2ca681c44387d601e6f39a1fc5ade83c2381081b':
Clarify a few things about bootcharts.
2015-03-28 20:47:22 +00:00
Elliott Hughes
12137b3ef0
am 9e0edb77: am 934102ba: Merge "Lose load_policy to toybox."
...
* commit '9e0edb77b0c266cb964cd17858a4ccb92b7d47da':
Lose load_policy to toybox.
2015-03-28 20:47:10 +00:00
Elliott Hughes
9e0edb77b0
am 934102ba: Merge "Lose load_policy to toybox."
...
* commit '934102baf8fca57abf63df7f134e977e696722db':
Lose load_policy to toybox.
2015-03-28 20:40:13 +00:00
Elliott Hughes
934102baf8
Merge "Lose load_policy to toybox."
2015-03-28 20:35:05 +00:00
Elliott Hughes
2ca681c443
am 1108b42a: am 48402951: Merge "Clarify a few things about bootcharts."
...
* commit '1108b42aa513abfa1c301c150c573a5bb5667ac3':
Clarify a few things about bootcharts.
2015-03-28 20:33:54 +00:00
Elliott Hughes
f29940559a
Lose load_policy to toybox.
...
Change-Id: I3ef3aab9eef8e07ee598e2559a316e2fccf7199b
2015-03-28 13:29:05 -07:00
Elliott Hughes
1108b42aa5
am 48402951: Merge "Clarify a few things about bootcharts."
...
* commit '48402951cfd44217ba50dbce5cc742db95d915c6':
Clarify a few things about bootcharts.
2015-03-28 20:27:14 +00:00
Elliott Hughes
48402951cf
Merge "Clarify a few things about bootcharts."
2015-03-28 20:22:01 +00:00
Dan Albert
b0f0afdd22
am c3ea0836: am 68d54808: am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""
...
* commit 'c3ea08369bc7bbbdf76914df949d6af0ee1b3bf0':
Revert "Remove the emulator special case from the "adb root" code."
2015-03-28 19:24:23 +00:00
Elliott Hughes
59abac27cb
Clarify a few things about bootcharts.
...
Make it clearer in dmesg when we're deliberately not doing
bootcharting, and explain in the documentation that the output
for init is quite misleading (and, as far as I can tell, not
within our power to fix).
Change-Id: I0b22a56f83521d64c6d176dc423c81f7ea86b23c
2015-03-28 12:12:51 -07:00
Elliott Hughes
5cb1a8f925
am ec86729b: am 7c3749c2: am 6a62cac4: Merge "Further cleanup of the logic in device_init."
...
* commit 'ec86729bc9397e65aa74d4b8d19c6e85bc17f87e':
Further cleanup of the logic in device_init.
2015-03-28 19:12:19 +00:00
Dan Albert
c3ea08369b
am 68d54808: am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""
...
* commit '68d54808dff7ef6f7ca95c23f51a7436e3b0188e':
Revert "Remove the emulator special case from the "adb root" code."
2015-03-28 19:12:00 +00:00
Dan Albert
68d54808df
am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""
...
* commit '8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd':
Revert "Remove the emulator special case from the "adb root" code."
2015-03-28 19:07:43 +00:00
Dan Albert
8f03e3cb3d
Merge "Revert "Remove the emulator special case from the "adb root" code.""
2015-03-28 19:04:40 +00:00
Dan Albert
868402e5bf
Revert "Remove the emulator special case from the "adb root" code."
...
adb root doesn't work on the emulator, so this prevents root access
to a userdebug emulator.
Since the emulator has always been root even on userdebug builds, it
may be that adb root has never worked on the emulator.
Bug: 19974213
This reverts commit abd6773b41
.
2015-03-28 19:04:15 +00:00
Elliott Hughes
ec86729bc9
am 7c3749c2: am 6a62cac4: Merge "Further cleanup of the logic in device_init."
...
* commit '7c3749c24ad6dad7e5ddf5b0478731470761d99c':
Further cleanup of the logic in device_init.
2015-03-28 18:58:27 +00:00
Elliott Hughes
7c3749c24a
am 6a62cac4: Merge "Further cleanup of the logic in device_init."
...
* commit '6a62cac4c1d2f10aa0a535df8e9757ee2f0fe725':
Further cleanup of the logic in device_init.
2015-03-28 18:52:16 +00:00