Roberto Pereira
c6e2c8d5f2
Merge changes I78f273db,I2fdaa9d3,Ib6e1df87 am: 67bf7dff4a am: e4804ddb74
...
am: 33767c412e
2018-08-10 17:22:37 -07:00
Roberto Pereira
33767c412e
Merge changes I78f273db,I2fdaa9d3,Ib6e1df87 am: 67bf7dff4a
...
am: e4804ddb74
2018-08-10 16:09:50 -07:00
Roberto Pereira
e4804ddb74
Merge changes I78f273db,I2fdaa9d3,Ib6e1df87
...
am: 67bf7dff4a
2018-08-10 14:34:56 -07:00
Treehugger Robot
67bf7dff4a
Merge changes I78f273db,I2fdaa9d3,Ib6e1df87
...
* changes:
Move IPC functionality from trusty_keymaster_device to trusty_keymaster_ipc
Update the Trusty Keymaster directory structure
Run clang-format on all trusty/keymaster .cpp and .h files
2018-08-10 19:49:33 +00:00
Greg Kaiser
82265c5d7e
Merge "fs_mgr: Small fix in overlayfs setup/teardown" am: 5f42ee186d am: 06c8fb2569
...
am: 7b5a663844
2018-08-10 09:20:21 -07:00
Mark Salyzyn
54e05a356f
Merge "llkd: switch to std::literals" am: 0e7dc30874 am: 9357ff4a13
...
am: 951a04a09b
2018-08-10 09:19:08 -07:00
Greg Kaiser
7b5a663844
Merge "fs_mgr: Small fix in overlayfs setup/teardown" am: 5f42ee186d
...
am: 06c8fb2569
2018-08-10 09:04:50 -07:00
Mark Salyzyn
951a04a09b
Merge "llkd: switch to std::literals" am: 0e7dc30874
...
am: 9357ff4a13
2018-08-10 08:55:51 -07:00
Greg Kaiser
06c8fb2569
Merge "fs_mgr: Small fix in overlayfs setup/teardown"
...
am: 5f42ee186d
2018-08-10 08:55:37 -07:00
Treehugger Robot
5f42ee186d
Merge "fs_mgr: Small fix in overlayfs setup/teardown"
2018-08-10 15:53:36 +00:00
Mark Salyzyn
9357ff4a13
Merge "llkd: switch to std::literals"
...
am: 0e7dc30874
2018-08-10 08:40:32 -07:00
Treehugger Robot
0e7dc30874
Merge "llkd: switch to std::literals"
2018-08-10 15:09:59 +00:00
Greg Kaiser
b4bf8c66a3
fs_mgr: Small fix in overlayfs setup/teardown
...
In user builds, we fix fs_mgr_overlayfs_{setup,teardown} to
properly set the optional 'change' boolean, if it was provided.
Test: TreeHugger
Change-Id: I91fc99d801f8fd782b21f0ecaecddfc7744f0c3e
2018-08-10 05:24:25 -07:00
David Anderson
fce798a99c
Merge "fastbootd: Add is-userspace variable." am: 6d5b931466 am: 2f1e709145
...
am: ed55753595
2018-08-09 17:07:51 -07:00
David Anderson
9e75c22bb9
Merge "fastbootd: Add commands for logical partitions." am: 770395dee1 am: e21fec88d4
...
am: a4f03721cd
2018-08-09 17:06:48 -07:00
David Anderson
ed55753595
Merge "fastbootd: Add is-userspace variable." am: 6d5b931466
...
am: 2f1e709145
2018-08-09 16:50:21 -07:00
David Anderson
a4f03721cd
Merge "fastbootd: Add commands for logical partitions." am: 770395dee1
...
am: e21fec88d4
2018-08-09 16:49:35 -07:00
Josh Gao
90ff5d6759
Merge changes If7c8d38f,I7117dd19,Iaa5006e3,I3a568361,I37df06e4, ... am: 18eae78c09 am: da23544c88
...
am: aca37b9a68
2018-08-09 16:48:54 -07:00
Steven Moreland
7add7e7f4c
Merge "ParseFloat/ParseDouble, also take std::string" am: edc9cee49b am: d367f37b1e
...
am: b163d9725e
2018-08-09 16:47:24 -07:00
Mark Salyzyn
483e969256
Merge changes from topic "squashfs+overlayfs" am: d88b52e7f4 am: 8aa329d0e2
...
am: 981b478731
2018-08-09 16:45:45 -07:00
Josh Gao
aca37b9a68
Merge changes If7c8d38f,I7117dd19,Iaa5006e3,I3a568361,I37df06e4, ... am: 18eae78c09
...
am: da23544c88
2018-08-09 16:44:42 -07:00
David Anderson
2f1e709145
Merge "fastbootd: Add is-userspace variable."
...
am: 6d5b931466
2018-08-09 16:37:59 -07:00
David Anderson
e21fec88d4
Merge "fastbootd: Add commands for logical partitions."
...
am: 770395dee1
2018-08-09 16:37:02 -07:00
Steven Moreland
b163d9725e
Merge "ParseFloat/ParseDouble, also take std::string" am: edc9cee49b
...
am: d367f37b1e
2018-08-09 16:36:44 -07:00
Mark Salyzyn
981b478731
Merge changes from topic "squashfs+overlayfs" am: d88b52e7f4
...
am: 8aa329d0e2
2018-08-09 16:32:37 -07:00
Josh Gao
da23544c88
Merge changes If7c8d38f,I7117dd19,Iaa5006e3,I3a568361,I37df06e4, ...
...
am: 18eae78c09
2018-08-09 16:30:42 -07:00
Steven Moreland
d367f37b1e
Merge "ParseFloat/ParseDouble, also take std::string"
...
am: edc9cee49b
2018-08-09 16:29:19 -07:00
Mark Salyzyn
8aa329d0e2
Merge changes from topic "squashfs+overlayfs"
...
am: d88b52e7f4
2018-08-09 16:22:24 -07:00
Treehugger Robot
6d5b931466
Merge "fastbootd: Add is-userspace variable."
2018-08-09 23:17:16 +00:00
Treehugger Robot
770395dee1
Merge "fastbootd: Add commands for logical partitions."
2018-08-09 23:16:27 +00:00
Josh Gao
18eae78c09
Merge changes If7c8d38f,I7117dd19,Iaa5006e3,I3a568361,I37df06e4, ...
...
* changes:
adb: report connection status when we're unauthorized.
adb: disable test_device.FileOperationsTest.test_pull_symlink_dir.
adb: fix test_device.FileOperationsTest.test_push_empty
adb: switch test_adb.py over to double quotes.
adb: make test_adb.py work on windows.
adb: switch test_adb.py to python3.
2018-08-09 22:12:46 +00:00
David Anderson
d9ba061e77
fastbootd: Add is-userspace variable.
...
Bug: 78793464
Test: fastboot getvar is-userspace
returns true for fastbootd
fastboot getvar is-userspace
returns false or error for bootloader fastboot.
Change-Id: I80e1ef6dcf3922e4f555cb2e409e3e098c16fbbc
2018-08-09 15:06:53 -07:00
David Anderson
0d4277d7b3
fastbootd: Add commands for logical partitions.
...
This patch adds the following new commands to fastbootd:
getvar is_logical:<partition>
create-logical-logical-partition <partition> <size>
delete-logical-partition <partition>
resize-logicallogical-partition <partition> <size>
All of these commands operate on logical partitions only, and require a
properly configured "super" partition to operate.
Bug: 78793464
Test: fastboot create-logical-partition example 4096
fastboot create-logical-partition example 4096 returns error
fastboot getvar is-logical:example returns "yes"
fastboot getvar partition-size:example returns "1000"
fastboot resize-logicalpartition example 8000
fastboot getvar partition-size:example returns "2000"
fastboot delete-logical-partition example
fastboot getvar is-logical:example returns error
fastboot getvar is-logical:system_a returns "no"
Change-Id: Iff323eabcf5c559fa04c7c92574650b01803eb1f
2018-08-09 15:06:52 -07:00
Steven Moreland
edc9cee49b
Merge "ParseFloat/ParseDouble, also take std::string"
2018-08-09 21:35:31 +00:00
Mark Salyzyn
d88b52e7f4
Merge changes from topic "squashfs+overlayfs"
...
* changes:
init: add fs_mgr_overlayfs_mount_all to FirstStageMount
adb: add overlayfs handling for readonly system filesystems
fs_mgr: get fs_mgr_mount_all to call fs_mgr_overlayfs_mount_all
fs_mgr: add overlayfs handling for squashfs system filesystems
2018-08-09 20:44:20 +00:00
David Anderson
d39e8afa30
Merge changes Id2a61d35,Ibe802c36 am: 3cf9f9b838 am: dff1cef8ae
...
am: 369082b55f
2018-08-09 13:20:21 -07:00
David Anderson
369082b55f
Merge changes Id2a61d35,Ibe802c36 am: 3cf9f9b838
...
am: dff1cef8ae
2018-08-09 13:11:08 -07:00
David Anderson
dff1cef8ae
Merge changes Id2a61d35,Ibe802c36
...
am: 3cf9f9b838
2018-08-09 13:04:12 -07:00
Treehugger Robot
3cf9f9b838
Merge changes Id2a61d35,Ibe802c36
...
* changes:
fastbootd: Add support for flashing logical partitions.
fastbootd: Enable erase and flash commands for physical partitions.
2018-08-09 19:47:17 +00:00
Tom Cherry
7ade77b470
Merge "init: clarify comment for the restorecon of second stage init" am: 424ffa2df9 am: f1e6db5567
...
am: 28f2c822b9
2018-08-09 12:04:30 -07:00
Tom Cherry
28f2c822b9
Merge "init: clarify comment for the restorecon of second stage init" am: 424ffa2df9
...
am: f1e6db5567
2018-08-09 12:01:23 -07:00
Tom Cherry
f1e6db5567
Merge "init: clarify comment for the restorecon of second stage init"
...
am: 424ffa2df9
2018-08-09 11:56:25 -07:00
Treehugger Robot
424ffa2df9
Merge "init: clarify comment for the restorecon of second stage init"
2018-08-09 18:28:49 +00:00
David Anderson
88ef0b1f25
fastbootd: Add support for flashing logical partitions.
...
When flashing logical partitions, we read the "super" partition metadata
corresponding to the current slot. We then temporarily create a
device-mapper device for that partition, and immediately destroy the
device after all operations are complete. We do not mount partitions
ahead of time, or keep them mounted, because a fastboot operation may
change the layout of the logical partition table (or change which slot
is current).
Bug: 78793464
Test: fastboot flash a logical partition under "super"
Change-Id: Id2a61d3592decabeebfd283c4fd6e6cbe576a18c
2018-08-09 11:15:23 -07:00
Steven Moreland
f1911f4ba3
ParseFloat/ParseDouble, also take std::string
...
For convenience and to match the integer parsing functions.
Bug: 110758329
Test: m only
Change-Id: I33620d9a29465e1f425872fd57063ac32031988a
2018-08-09 10:49:45 -07:00
Tom Cherry
e85b2addca
init: clarify comment for the restorecon of second stage init
...
Test: we actually do need this restorecon for recovery.
Change-Id: I46a8d6ea5c08b18d79fa6dd8df0f4a98695363e2
2018-08-09 10:40:51 -07:00
David Anderson
12211d163e
fastbootd: Enable erase and flash commands for physical partitions.
...
Bug: 78793464
Test: adb reboot fastboot && fastboot flashall
Change-Id: Ibe802c36f6efe20111a2315616ef34d3a027950f
2018-08-09 09:58:37 -07:00
Tao Bao
cc942f05de
Merge "fastboot: fastbootd uses libadbd.so." am: 075c351af2 am: 47c07649af
...
am: 12d1f835dd
2018-08-09 09:52:12 -07:00
David Anderson
d49657285a
Merge "fastbootd: Allow returning errors from getvar handlers." am: 4264b7f5d2 am: e60694d66a
...
am: fa5f5d2641
2018-08-09 09:51:02 -07:00
Tao Bao
12d1f835dd
Merge "fastboot: fastbootd uses libadbd.so." am: 075c351af2
...
am: 47c07649af
2018-08-09 09:46:52 -07:00
