Wei Wang
81794deecf
Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f am: eb9ddd14f1 am: d7652f553c
...
am: c9c66cd486
Change-Id: Ibb9248214e48f937c80bf6af88124d602e32d502
2017-04-17 20:44:23 +00:00
Wei Wang
c9c66cd486
Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f am: eb9ddd14f1
...
am: d7652f553c
Change-Id: I1e1fee25ddd8f990dac12712dc1ae1955736f2d8
2017-04-17 20:29:05 +00:00
Wei Wang
d7652f553c
Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f
...
am: eb9ddd14f1
Change-Id: I5dce107407c04212e667099d1da0d67f96a6322d
2017-04-17 20:15:43 +00:00
Wei Wang
eb9ddd14f1
Merge "init.rc: set initial cpuset to all cores"
...
am: 66f44d823f
Change-Id: I5caa54781b72126a01171fcf483eca488d90f7b5
2017-04-17 20:10:43 +00:00
Chris Fries
42f92cf206
Merge changes from topic '36810152' am: b7826a74f2 am: a14353e664 am: b174f19f24
...
am: 45d4eb8dd2
Change-Id: I711a67c8c9abf696412514670a0e57f3d4c10b83
2017-04-17 20:06:28 +00:00
Wei Wang
66f44d823f
Merge "init.rc: set initial cpuset to all cores"
2017-04-17 20:01:43 +00:00
Chris Fries
45d4eb8dd2
Merge changes from topic '36810152' am: b7826a74f2 am: a14353e664
...
am: b174f19f24
Change-Id: Ice073716a1a7b0cbbce9d423148ee314d003548e
2017-04-17 19:50:25 +00:00
Chris Fries
b174f19f24
Merge changes from topic '36810152' am: b7826a74f2
...
am: a14353e664
Change-Id: Iae75cb1bf56186a797f0e7a60e62d361c248866a
2017-04-17 19:41:42 +00:00
Keun-young Park
1503b03d34
Merge "check ext4 magic before running next steps" into oc-dev am: 421067e040
...
am: 662ef6f866
Change-Id: I96dd8718267b3df703ff5c532725b8ab7ddd9c5a
2017-04-17 19:37:53 +00:00
Chris Fries
a14353e664
Merge changes from topic '36810152'
...
am: b7826a74f2
Change-Id: I7ab0cc7268efb9ab6a560c0aa968ec565cac16d0
2017-04-17 19:36:43 +00:00
Chris Fries
b7826a74f2
Merge changes from topic '36810152'
...
* changes:
fastboot: Support larger transfers during flash
fastboot: Cap max size sent to libsparse
fastboot: add AdbWinUsbApi as a required module
2017-04-17 19:31:38 +00:00
Keun-young Park
662ef6f866
Merge "check ext4 magic before running next steps" into oc-dev
...
am: 421067e040
Change-Id: I3f519182d9a8d90a2e426de63480e2ed399502ae
2017-04-17 19:12:10 +00:00
Keun-young Park
421067e040
Merge "check ext4 magic before running next steps" into oc-dev
2017-04-17 19:03:57 +00:00
Chris Fries
0ea946c007
fastboot: Support larger transfers during flash
...
Adding methods to queue and download flashable images by fd instead of
by pointer, so that we can deal with sending large (up to 4GB) files
on windows and linux. This gets past limitations on linux to read
more than 2GB from a file at a time, as well as memory limitations
on win32, in order to download up to 4GB in a single transfer.
Test: fastboot -w
Test: "flash-all" from nexus factory images site (incl. fastboot -w update)
Test: fastboot flash with large and small image, large and small max-download-size
Test: Sanity check flashing on win32, darwin, linux.
Test: Sanity check 3GB image download (with 3GB max-download-size)
on win32, darwin, linux.
Bug: 36810152
Change-Id: I528d739d344eb080d59d721dadf3b3b34d4b375e
2017-04-17 09:22:49 -05:00
Elliott Hughes
03557c0cd9
Merge "Add a README.md about our shell and utilities." am: 75d195693b am: 48f034932b am: 298ae04ad6
...
am: ee3d0bd23e
Change-Id: Ie717789890ef60affdbae77a36c9d86c7d9243c3
2017-04-15 15:58:09 +00:00
Elliott Hughes
ee3d0bd23e
Merge "Add a README.md about our shell and utilities." am: 75d195693b am: 48f034932b
...
am: 298ae04ad6
Change-Id: Ifbeb10406ce71e9ed688c2decdb6c1749e56d092
2017-04-15 15:55:53 +00:00
Elliott Hughes
298ae04ad6
Merge "Add a README.md about our shell and utilities." am: 75d195693b
...
am: 48f034932b
Change-Id: I61380d247f1f5a3cb903bf35932690e293f17a22
2017-04-15 15:43:33 +00:00
Elliott Hughes
48f034932b
Merge "Add a README.md about our shell and utilities."
...
am: 75d195693b
Change-Id: I05279fbc5de92efa6e8a5fb2a51e702b0e1427d5
2017-04-15 15:40:04 +00:00
Treehugger Robot
75d195693b
Merge "Add a README.md about our shell and utilities."
2017-04-15 15:33:41 +00:00
Elliott Hughes
6352c038a4
Merge "Revert "Send property_service AVC messages to the kernel audit system"" into oc-dev am: 29ab67b0c1
...
am: f90a63474d
Change-Id: Ie5a01594394c1667c6ad62cd58c34d7e1c328a26
2017-04-15 07:43:37 +00:00
Elliott Hughes
f90a63474d
Merge "Revert "Send property_service AVC messages to the kernel audit system"" into oc-dev
...
am: 29ab67b0c1
Change-Id: Icbf6c2ac3493464d76bcddf6091cc73c47829beb
2017-04-15 07:40:52 +00:00
TreeHugger Robot
29ab67b0c1
Merge "Revert "Send property_service AVC messages to the kernel audit system"" into oc-dev
2017-04-15 07:37:38 +00:00
Bowgo Tsai
698384ef10
Merge "Set libavb version into system property for Treble OTA" am: e8311491da am: 7b08869382 am: 6f3ec3d759
...
am: 6e69b2ea2a
Change-Id: I1a6acaf7f42140a7a31dd95006a876dfd4919d9b
2017-04-15 06:11:02 +00:00
Bowgo Tsai
6e69b2ea2a
Merge "Set libavb version into system property for Treble OTA" am: e8311491da am: 7b08869382
...
am: 6f3ec3d759
Change-Id: I2c97b605e75c479e485ac36e1e90c039467df04e
2017-04-15 06:07:10 +00:00
Bowgo Tsai
6f3ec3d759
Merge "Set libavb version into system property for Treble OTA" am: e8311491da
...
am: 7b08869382
Change-Id: Ic445d12e5fc26a1a534011c7033d79e730538653
2017-04-15 05:55:57 +00:00
Bowgo Tsai
7b08869382
Merge "Set libavb version into system property for Treble OTA"
...
am: e8311491da
Change-Id: I867972462df8d5830aa520a9d227ca4d8f9f8be2
2017-04-15 05:52:58 +00:00
Bowgo Tsai
e8311491da
Merge "Set libavb version into system property for Treble OTA"
2017-04-15 05:49:25 +00:00
Jiyong Park
2e24e8e2f0
Merge "Configure ld.config.txt for SP-HALs" into oc-dev am: 43b72b58f2
...
am: 7610066315
Change-Id: I59ede8903c6890b976ef3ca42c7ad1d220470a42
2017-04-15 02:07:02 +00:00
Bowgo Tsai
eebd987936
Merge changes from topic 'avb-early-mount' into oc-dev am: cc23327951 -s ours
...
am: 5924523eb2
Change-Id: I9c5b1e4d9045be44900d9d6d5351cf8cd2a5060d
2017-04-15 02:06:44 +00:00
Jiyong Park
7610066315
Merge "Configure ld.config.txt for SP-HALs" into oc-dev
...
am: 43b72b58f2
Change-Id: I3e7e5f142f6c8e76da26e25362eccd35f10b81f1
2017-04-15 02:04:49 +00:00
Bowgo Tsai
5924523eb2
Merge changes from topic 'avb-early-mount' into oc-dev
...
am: cc23327951 -s ours
Change-Id: Ib1290196a8f08ffecf936f4393807d69c77eaa10
2017-04-15 02:04:27 +00:00
TreeHugger Robot
43b72b58f2
Merge "Configure ld.config.txt for SP-HALs" into oc-dev
2017-04-15 01:47:39 +00:00
Bowgo Tsai
1a898c25f9
Set libavb version into system property for Treble OTA
...
Set ro.boot.avb_version to "AVB_VERSION_MAJOR.AVB_VERSION_MINOR".
During Treble OTA match, the major version must be the same as that in
the avb metadata on disk, while the minor version can be equal or
greater to that in the avb metadata on disk.
See how avb versioning work on the following link:
https://android-review.googlesource.com/#/c/342757/
Also renames AvbHashtreeDisabled() -> hashtree_disabled().
Bug: 35322304
Test: Early mount with AVB, checks [ro.boot.avb_version]: [1.0] exists.
Test: Not enable AVB, checks [ro.boot.avb_version] doesn't exists.
Change-Id: I5aaf476ca53c4fe817779518ba14b68ebcfdc6d6
2017-04-15 09:47:31 +08:00
Keun-young Park
007b7110ab
Merge "check ext4 magic before running next steps" am: 82bd278dc4 am: 9183d0701d am: 8a8ac86cf6
...
am: ab389288ad
Change-Id: I40650830f287b73e7ff40be31b7a6f9f6f69e501
2017-04-15 01:36:55 +00:00
TreeHugger Robot
cc23327951
Merge changes from topic 'avb-early-mount' into oc-dev
...
* changes:
fs_mgr: support AVB in fs_mgr_update_verity_state()
init: support early_mount with vboot 2.0 (external/avb/libavb)
fs_mgr: adds/changes some public APIs for early mount in init
fs_mgr_avb: refactors how vbmeta is loaded
fs_mgr: adding fs_mgr_get_slot_suffix() public API
2017-04-15 01:12:33 +00:00
Elliott Hughes
5a0818a633
Add a README.md about our shell and utilities.
...
This is definitely a FAQ, and it doesn't make sense for me to maintain
this on Google+ when I have the power to just check it in (and now have
a sensible place to do so).
Bug: N/A
Test: N/A
Change-Id: I649803ac846917a45f4b7b89cffe5b450179c479
2017-04-14 17:59:55 -07:00
Elliott Hughes
a39515ce8d
Revert "Send property_service AVC messages to the kernel audit system"
...
This reverts commit 8adb4d9d12 .
(cherrypick of d8f9356bec )
Change-Id: I0db29617f323ef31ca5a270d02b7668092e9c9e1
2017-04-14 17:44:22 -07:00
Keun-young Park
ab389288ad
Merge "check ext4 magic before running next steps" am: 82bd278dc4 am: 9183d0701d
...
am: 8a8ac86cf6
Change-Id: I98e37f994cf08f92cada289f64dda9530c64b4f3
2017-04-15 00:35:39 +00:00
Keun-young Park
835239a2c2
check ext4 magic before running next steps
...
- mount, e2fsck, tune2fs will all fail if magic number does not match.
- mismatch always happen for FDE and is wasting boot-up time to try
all and fail always.
- skip mount steps if it has invalid magic number and do not record
fs_stat either.
- For ext4 fs with corrupt superblock, e2fsck refuses to do anything if
superblock magic is invalid. So simply running e2fsck does not help
anyway.
bug: 36231950
Test: reboot ane check fs_mgr log from dmesg
(cherry picked from commit 6000a3f657 )
Change-Id: Ia7120a188c316262da5fdb986c7d9c76db86aa7b
2017-04-14 17:33:25 -07:00
Keun-young Park
8a8ac86cf6
Merge "check ext4 magic before running next steps" am: 82bd278dc4
...
am: 9183d0701d
Change-Id: I0ef0cfe69695dce01398cd6fe7a469d4ddbbba4e
2017-04-15 00:33:06 +00:00
Elliott Hughes
1abf533ae8
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6 am: aee26df200 am: 246a7e57b8
...
am: 77fc053638
Change-Id: I1edd70a8b2ec0dab7f72d2797bafcf39520a0984
2017-04-15 00:32:19 +00:00
Alistair Strachan
8a8e411868
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev am: fb803d50d0
...
am: 409db49df8
Change-Id: Ic498ff2c35010988cdfeea107c313ed9ead09eaa
2017-04-15 00:32:03 +00:00
Keun-young Park
9183d0701d
Merge "check ext4 magic before running next steps"
...
am: 82bd278dc4
Change-Id: I78a510725a199b5056ede41492e07b45dce022f5
2017-04-15 00:30:35 +00:00
Elliott Hughes
77fc053638
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6 am: aee26df200
...
am: 246a7e57b8
Change-Id: Ibf1c376d96c1d9000b44b89432d6c959d050309b
2017-04-15 00:29:22 +00:00
Keun-young Park
82bd278dc4
Merge "check ext4 magic before running next steps"
2017-04-15 00:26:32 +00:00
Elliott Hughes
246a7e57b8
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6
...
am: aee26df200
Change-Id: I52782f3954cfe697dfa134ef778b0835650d5e16
2017-04-15 00:21:35 +00:00
Elliott Hughes
aee26df200
Merge "Revert "Send property_service AVC messages to the kernel audit system""
...
am: eea60804f6
Change-Id: I030cd689a554f6af953a95fc903ffad31280486a
2017-04-15 00:18:34 +00:00
Alistair Strachan
409db49df8
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev
...
am: fb803d50d0
Change-Id: Ifd281185c536fc00552ee8e9a47ca8290373ef95
2017-04-15 00:14:32 +00:00
Elliott Hughes
eea60804f6
Merge "Revert "Send property_service AVC messages to the kernel audit system""
2017-04-15 00:13:47 +00:00
TreeHugger Robot
fb803d50d0
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev
2017-04-15 00:08:16 +00:00