changho.shin
bc511b421f
Merge "Support product partition for non-treblized devices" am: 79bd67bb2f am: 7a6df0832a
...
am: b1c845d003
2018-11-30 01:06:35 -08:00
Colin Cross
665681df74
Merge "Validate allocations against mappings" am: 9b52891918 am: 5e07981095
...
am: 7c595b7a3f
2018-11-30 01:02:11 -08:00
changho.shin
b1c845d003
Merge "Support product partition for non-treblized devices" am: 79bd67bb2f
...
am: 7a6df0832a
2018-11-30 00:41:26 -08:00
Colin Cross
7c595b7a3f
Merge "Validate allocations against mappings" am: 9b52891918
...
am: 5e07981095
2018-11-30 00:39:55 -08:00
changho.shin
7a6df0832a
Merge "Support product partition for non-treblized devices"
...
am: 79bd67bb2f
2018-11-30 00:22:59 -08:00
Colin Cross
5e07981095
Merge "Validate allocations against mappings"
...
am: 9b52891918
2018-11-30 00:20:07 -08:00
Treehugger Robot
79bd67bb2f
Merge "Support product partition for non-treblized devices"
2018-11-30 02:12:15 +00:00
Treehugger Robot
9b52891918
Merge "Validate allocations against mappings"
2018-11-30 01:33:27 +00:00
Mark Salyzyn
8920264bf5
Merge "fs_mgr: add README.overlayfs.md" am: 7472cf6c53 am: 7a6b9aef70
...
am: bc4299d2c2
2018-11-29 16:05:58 -08:00
Mark Salyzyn
bc4299d2c2
Merge "fs_mgr: add README.overlayfs.md" am: 7472cf6c53
...
am: 7a6b9aef70
2018-11-29 15:51:40 -08:00
Tom Cherry
12d026a14a
Merge "init: always create a symlink from /init to /system/bin/init" am: ac3c7740ad am: 15338e8a1d
...
am: 4d30ce667f
2018-11-29 15:50:52 -08:00
Mark Salyzyn
7a6b9aef70
Merge "fs_mgr: add README.overlayfs.md"
...
am: 7472cf6c53
2018-11-29 15:45:20 -08:00
Tom Cherry
4d30ce667f
Merge "init: always create a symlink from /init to /system/bin/init" am: ac3c7740ad
...
am: 15338e8a1d
2018-11-29 15:44:38 -08:00
Treehugger Robot
7472cf6c53
Merge "fs_mgr: add README.overlayfs.md"
2018-11-29 23:39:38 +00:00
Tom Cherry
15338e8a1d
Merge "init: always create a symlink from /init to /system/bin/init"
...
am: ac3c7740ad
2018-11-29 15:37:30 -08:00
Tom Cherry
ac3c7740ad
Merge "init: always create a symlink from /init to /system/bin/init"
2018-11-29 23:22:58 +00:00
Mark Salyzyn
a9a3b73163
fs_mgr: add README.overlayfs.md
...
Add documentation regarding overlayfs logistics.
Test: none
Bug: 109821005
Change-Id: I8092fdd548a28f8c860b5dd6175b657728a48801
2018-11-29 12:22:53 -08:00
David Anderson
ba0b0dbcec
Merge "fastboot: Delete logical "other" partitions on retrofit devices." am: d57025dc46 am: 24f2c034fd
...
am: 413208a83a
2018-11-29 12:16:07 -08:00
David Anderson
413208a83a
Merge "fastboot: Delete logical "other" partitions on retrofit devices." am: d57025dc46
...
am: 24f2c034fd
2018-11-29 12:12:50 -08:00
David Anderson
24f2c034fd
Merge "fastboot: Delete logical "other" partitions on retrofit devices."
...
am: d57025dc46
2018-11-29 12:06:28 -08:00
David Anderson
d57025dc46
Merge "fastboot: Delete logical "other" partitions on retrofit devices."
2018-11-29 19:52:12 +00:00
Colin Cross
3ca1976fa7
Validate allocations against mappings
...
Bug 120032857 is seeing what appears to be allocations with incorrect
end addresses, leading to a much later crash when it tries to map
a zero page outside the valid virtual address space. Detect allocations
that extend outside the highest or lowest memory mapping and crash
immediately instead.
Test: memunreachable_test
Bug: 120032857
Change-Id: I9be670a025143e7078360a6bf7a83219279614d9
2018-11-29 11:02:56 -08:00
Tom Cherry
9843007327
init: always create a symlink from /init to /system/bin/init
...
Even though it isn't strictly needed when not system-as-root, for
backwards compatibility, it is desired to keep this symlink.
Bug: 119851742
Test: tree-hugger
Change-Id: I47bc25ab257336f56ef09b5db6ebaf6b17daad35
2018-11-29 09:39:30 -08:00
Branden Archer
5ef04da9ac
Merge "Run BoringSSL self test during startup" am: 044e02764d am: 1500940065
...
am: bd41882d48
2018-11-29 09:26:28 -08:00
Tom Cherry
03d3984fb0
Merge "init: clean up the 1st/2nd stage init split" am: 3ecaf2e7f5 am: 8f1c2fc80e
...
am: 7cb240d765
2018-11-29 09:23:58 -08:00
Branden Archer
bd41882d48
Merge "Run BoringSSL self test during startup" am: 044e02764d
...
am: 1500940065
2018-11-29 09:18:16 -08:00
Tom Cherry
7cb240d765
Merge "init: clean up the 1st/2nd stage init split" am: 3ecaf2e7f5
...
am: 8f1c2fc80e
2018-11-29 09:15:35 -08:00
Branden Archer
1500940065
Merge "Run BoringSSL self test during startup"
...
am: 044e02764d
2018-11-29 09:09:03 -08:00
Tom Cherry
8f1c2fc80e
Merge "init: clean up the 1st/2nd stage init split"
...
am: 3ecaf2e7f5
2018-11-29 09:07:01 -08:00
Treehugger Robot
044e02764d
Merge "Run BoringSSL self test during startup"
2018-11-29 16:56:19 +00:00
Ivan Lozano
a46719f678
Merge "Revert "Disable XOM in init."" am: 4cafb54481 am: 3da6ff1ff4
...
am: 782068bc9d
2018-11-29 08:54:11 -08:00
Tom Cherry
3ecaf2e7f5
Merge "init: clean up the 1st/2nd stage init split"
2018-11-29 16:50:37 +00:00
Ivan Lozano
782068bc9d
Merge "Revert "Disable XOM in init."" am: 4cafb54481
...
am: 3da6ff1ff4
2018-11-29 08:35:37 -08:00
Ivan Lozano
3da6ff1ff4
Merge "Revert "Disable XOM in init.""
...
am: 4cafb54481
2018-11-29 08:21:09 -08:00
Ivan Lozano
4cafb54481
Merge "Revert "Disable XOM in init.""
2018-11-29 15:58:11 +00:00
Idries Hamadi
03d5b7af61
Merge "Add OWNERS file to fastdeploy so idries@ can approve changes" am: 01011fee14 am: 85b01ef628
...
am: e69f0ec1a8
2018-11-29 04:05:59 -08:00
Idries Hamadi
e69f0ec1a8
Merge "Add OWNERS file to fastdeploy so idries@ can approve changes" am: 01011fee14
...
am: 85b01ef628
2018-11-29 03:57:03 -08:00
Idries Hamadi
85b01ef628
Merge "Add OWNERS file to fastdeploy so idries@ can approve changes"
...
am: 01011fee14
2018-11-29 03:49:51 -08:00
Idries Hamadi
01011fee14
Merge "Add OWNERS file to fastdeploy so idries@ can approve changes"
2018-11-29 11:37:51 +00:00
Mark Salyzyn
7f3a560e0e
Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel" am: cbc4116352 am: c4df6be07e
...
am: cb802772bf
2018-11-28 19:49:22 -08:00
Mark Salyzyn
cb802772bf
Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel" am: cbc4116352
...
am: c4df6be07e
2018-11-28 19:45:13 -08:00
Mark Salyzyn
c4df6be07e
Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel"
...
am: cbc4116352
2018-11-28 19:41:02 -08:00
Treehugger Robot
cbc4116352
Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel"
2018-11-29 03:37:37 +00:00
Elliott Hughes
bcbae55e73
Merge "tombstoned: fixed tombstones failed issue" am: 894da4e0fd am: f8bb1eb5c5
...
am: 474983e2f9
2018-11-28 18:16:01 -08:00
Elliott Hughes
474983e2f9
Merge "tombstoned: fixed tombstones failed issue" am: 894da4e0fd
...
am: f8bb1eb5c5
2018-11-28 18:13:09 -08:00
Elliott Hughes
f8bb1eb5c5
Merge "tombstoned: fixed tombstones failed issue"
...
am: 894da4e0fd
2018-11-28 18:04:13 -08:00
Elliott Hughes
894da4e0fd
Merge "tombstoned: fixed tombstones failed issue"
2018-11-29 01:48:29 +00:00
Christopher Ferris
f269e77404
Merge "Add support for caching small reads." am: e2e519ea2f am: d693942865
...
am: e9e7e5d613
2018-11-28 17:48:29 -08:00
Mark Salyzyn
7b6ebe7e83
[automerger skipped] Merge changes Ic4e1a1de,Icfceaa46 am: 4055587ddd am: 24a958dc17
...
am: a4b1719238
2018-11-28 17:47:36 -08:00
David Anderson
0c73234fe0
fastboot: Delete logical "other" partitions on retrofit devices.
...
On retrofit devices, if both slots contain dynamic partition builds,
then "flashall" will attempt to write secondary images to dynamic
partitions in the other slot. At worst, this can fail with an error. At
best, it will result in the "other" partition not being mounted on first
boot.
This patch therefore deletes logical partitions for secondary images, on
retrofit devices only. On a Pixel device on the "b" slot, this means
"system_a" and "vendor_a" will be deleted before flashing, and therefore
system_other and vendor_other will be flashed to physical partitions
instead.
Bug: 120034852
Test: fastboot set_active a
fastboot flashall
fastboot set_active b
fastboot flashall
Change-Id: I6affe9a6c639b0495bffc77fcf20f329b86ad159
2018-11-28 17:47:21 -08:00
