David Anderson
262e7ca1f6
Merge changes I82b7d77b,I6b77690c am: ad7d1d13a4 am: 85d6c1cff5 am: 3526a48e87
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36ff5ab45ba8a5073dfd7fef1c5bbabce0b85ad1
2021-01-25 22:22:11 +00:00
David Anderson
e2d54ec543
Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." am: 291a5058cb am: 0bfda0923b am: d380da2e68
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556787
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72e2c38524429e2c06926b6b7470af0e6cda79ee
2021-01-25 22:21:48 +00:00
David Anderson
3526a48e87
Merge changes I82b7d77b,I6b77690c am: ad7d1d13a4 am: 85d6c1cff5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3865a6659fdc430e9573e9fe5e8a522520b76438
2021-01-25 21:56:04 +00:00
David Anderson
d380da2e68
Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." am: 291a5058cb am: 0bfda0923b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556787
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic09fbc4dc3c82d85ea89fb42404b79a7c3c18892
2021-01-25 21:55:39 +00:00
David Anderson
85d6c1cff5
Merge changes I82b7d77b,I6b77690c am: ad7d1d13a4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60577e13b7e87aaa0f72fdf0fbf8209184812f18
2021-01-25 21:44:48 +00:00
David Anderson
0bfda0923b
Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." am: 291a5058cb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556787
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id85062432b90ab4bb4e283e50790b50a772d412c
2021-01-25 21:35:08 +00:00
David Anderson
ad7d1d13a4
Merge changes I82b7d77b,I6b77690c
...
* changes:
first_stage_mount: Create snapshot devices before launching first_stage_console
first_stage_mount: Move CreateLogicalPartitions to DoFirstStageMount
2021-01-25 21:28:55 +00:00
David Anderson
291a5058cb
Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest."
2021-01-25 21:00:40 +00:00
Mitch Phillips
fc034f3544
Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a am: 9951b2fa1a am: 0a6a89d04f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I657bb0353d6c823c8f52b27d578435c7334e6524
2021-01-25 18:19:53 +00:00
Mitch Phillips
0a6a89d04f
Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a am: 9951b2fa1a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a84f7f3ab171ee86376c9743c478501b3d31e62
2021-01-25 17:56:37 +00:00
Elliot Berman
9583e92257
first_stage_mount: Create snapshot devices before launching first_stage_console
...
During device bringup, dynamic partitions may not be properly
configured by some sort of build or load misconfiguration. Diagnosing
such issues can be difficult without being able to see which partitions
are available and what they contain.
Aditionally, making logical partitions available to first stage console
permits early mounting of vendor partition and allows primitive
validation of vendor scripts without requiring full Android
environment. For instance, vendor_dlkm partition and modules can be
probed needing to have a full Android bootup.
Creation of logical partitions is done only when first_stage_console is
requested in order to have minimal impact on normal boot. Thus, only a
small refactor is required to split CreateLogicalPartitions out of
MountPartitions.
Bug: 174685384
Bug: 173732805
Change-Id: I82b7d77b9dc75af59b5e18b574e3eb99c8aff9e2
Signed-off-by: Elliot Berman <eberman@quicinc.com>
2021-01-25 09:53:36 -08:00
Elliot Berman
a619f22e37
first_stage_mount: Move CreateLogicalPartitions to DoFirstStageMount
...
In preparation for later commit:
first_stage_mount: Create snapshot devices before launching
first_stage_console
Bug: 173732805
Bug: 174685384
Change-Id: I6b77690c7cf68f6235c99bf4ff897b0ee41c4d0e
Signed-off-by: Elliot Berman <eberman@quicinc.com>
2021-01-25 09:53:35 -08:00
Mitch Phillips
9951b2fa1a
Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7daa6d13eefce2cf48ae0bde64fd8d55ef8b8aa8
2021-01-25 17:45:53 +00:00
Mitch Phillips
1d792bf90a
Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug."
2021-01-25 17:20:40 +00:00
Bowgo Tsai
839083be0b
Merge "libfs_avb: Fix unit test failures" am: 38de3ba65f am: d46d8d9e8e am: 074c8f348e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89c1761b021cf182629ddda5711e7ee2be0dba93
2021-01-25 11:39:06 +00:00
Bowgo Tsai
074c8f348e
Merge "libfs_avb: Fix unit test failures" am: 38de3ba65f am: d46d8d9e8e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic46031fd99550d4be5d2709af796a04f434774a7
2021-01-25 11:09:19 +00:00
Bowgo Tsai
d46d8d9e8e
Merge "libfs_avb: Fix unit test failures" am: 38de3ba65f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1251698ebe6d8c20b6f8413d6cece4a1f19cc05
2021-01-25 10:32:29 +00:00
Bowgo Tsai
38de3ba65f
Merge "libfs_avb: Fix unit test failures"
2021-01-25 10:13:25 +00:00
Bowgo Tsai
4767ff6346
Merge "Mark libvbmeta_test as not unit tests" am: 8d84d08da6 am: 42da52aae6 am: 8e491dced4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558427
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4dfd2c7e84a507bff22c483d79e95f0f8d96abf3
2021-01-25 09:53:19 +00:00
Bowgo Tsai
8e491dced4
Merge "Mark libvbmeta_test as not unit tests" am: 8d84d08da6 am: 42da52aae6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558427
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58ab41f5e560eeeb75ddbe53162f3a0db16b034d
2021-01-25 09:40:02 +00:00
Bowgo Tsai
42da52aae6
Merge "Mark libvbmeta_test as not unit tests" am: 8d84d08da6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558427
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ad2455c1a416b169a1f04e39ada691b8dee5e65
2021-01-25 09:11:44 +00:00
Bowgo Tsai
8d84d08da6
Merge "Mark libvbmeta_test as not unit tests"
2021-01-25 08:43:18 +00:00
Bowgo Tsai
708d962795
libfs_avb: Fix unit test failures
...
There more output lines of `avbtool` now, adjusts the expected
output of `avbtool info_image --image test.img` in the test
cases.
Bug: 178215452
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Change-Id: I924d6d97ef0a4c19c93017c2491bf251dfc51cae
2021-01-25 16:19:03 +08:00
Seigo Nonaka
7ffe3e99d0
Merge "Set up /data/fonts directory for updatable system fonts" am: 4356f6e98d am: 922eb5b4fd am: d8f86dfcf1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1502269
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bbff3846714ce753f6c4d5de4f605259c0a2ed2
2021-01-25 06:56:15 +00:00
Seigo Nonaka
d8f86dfcf1
Merge "Set up /data/fonts directory for updatable system fonts" am: 4356f6e98d am: 922eb5b4fd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1502269
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ae14defa17f1a432f3a45ad9bbe8bba2a894ce4
2021-01-25 06:27:40 +00:00
Seigo Nonaka
922eb5b4fd
Merge "Set up /data/fonts directory for updatable system fonts" am: 4356f6e98d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1502269
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3ac38a3b435336949170af9b6df2295df527668
2021-01-25 06:11:58 +00:00
Seigo Nonaka
4356f6e98d
Merge "Set up /data/fonts directory for updatable system fonts"
2021-01-25 05:47:03 +00:00
Yo Chiang
5e6b528667
Merge "adb remount -R should enable DSU if suitable" am: 8d60fefae8 am: 2099999a11 am: 2f345e760c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553825
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68d730e719465429ac9feb94cf84185ec6eb032e
2021-01-25 00:36:00 +00:00
Yo Chiang
2f345e760c
Merge "adb remount -R should enable DSU if suitable" am: 8d60fefae8 am: 2099999a11
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553825
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8d96fa963c456a9b2c9eb5359afc7ba83df8a9e
2021-01-25 00:23:10 +00:00
Yo Chiang
2099999a11
Merge "adb remount -R should enable DSU if suitable" am: 8d60fefae8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553825
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3e0501a47987514ff033a6d5e807a2f3c1e8bc5
2021-01-24 23:58:35 +00:00
Yo Chiang
8d60fefae8
Merge "adb remount -R should enable DSU if suitable"
2021-01-24 23:38:28 +00:00
Linzhao Ye
0ba15f789b
Merge "Allow system server to access sysfs node of led lights." am: 5a9b8577c9 am: d0399c1ff9 am: 9899a64f52
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I915a03b110ed6fc78ef68f2b21a0c989fbcfd0e2
2021-01-23 18:21:05 +00:00
Linzhao Ye
9899a64f52
Merge "Allow system server to access sysfs node of led lights." am: 5a9b8577c9 am: d0399c1ff9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife85aafc2d5a4babbfe1bcaa7bf143d8dfd41582
2021-01-23 18:02:27 +00:00
Linzhao Ye
d0399c1ff9
Merge "Allow system server to access sysfs node of led lights." am: 5a9b8577c9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f5dd0f8de9634baebe937c2b6f4a28aa04cf48d
2021-01-23 17:25:46 +00:00
Linzhao Ye
5a9b8577c9
Merge "Allow system server to access sysfs node of led lights."
2021-01-23 17:08:46 +00:00
Woody Lin
106eb02fe6
Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" am: 81bf17ce0f am: 1d24da452d am: 568cd24f41
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7244d08c7956d28b664e17057b9f587d38ef7498
2021-01-23 01:43:11 +00:00
Woody Lin
568cd24f41
Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" am: 81bf17ce0f am: 1d24da452d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24d7311db98edd38ae5b58c5943c1f5851b64594
2021-01-23 01:27:57 +00:00
Woody Lin
1d24da452d
Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" am: 81bf17ce0f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iece3de95103e59aa2ce04689f93fa7bdc0cc9801
2021-01-23 01:07:35 +00:00
Elliott Hughes
56ba1540f2
[automerger skipped] Merge "libadf: delete libadf & libadfhwc" am: ad5b717c5b am: 33073c81b6 am: 6f79cbe47e -s ours
...
am skip reason: Change-Id Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255 with SHA-1 dd377ccefd is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2aa86364563d7d98199cdaf61c5cf05ea81a124
2021-01-23 01:06:56 +00:00
Woody Lin
81bf17ce0f
Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL"
2021-01-23 00:34:06 +00:00
Elliott Hughes
6f79cbe47e
Merge "libadf: delete libadf & libadfhwc" am: ad5b717c5b am: 33073c81b6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9f4f5d8d0c75e6408234f74e074183166f6ea6a
2021-01-23 00:15:36 +00:00
Elliott Hughes
33073c81b6
Merge "libadf: delete libadf & libadfhwc" am: ad5b717c5b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idac17b8503f7485e3fb6b51deec33bcfd5e688aa
2021-01-22 23:54:11 +00:00
Elliott Hughes
ad5b717c5b
Merge "libadf: delete libadf & libadfhwc"
2021-01-22 23:37:48 +00:00
Marissa Wall
254d753f34
libadf: delete libadf & libadfhwc
...
libadf is a helper library for adf (android display framework)
kernel drivers. The last Android Common Kernel to support adf was
4.4. Delete this helper library since we do not support any kernels
that can use it.
If a vendor needs this library, they can fork it.
If you have any concerns, please contact adelva@google.com .
Bug: 150467766
Test: Compiles
Change-Id: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255
Merged-In: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255
2021-01-22 19:30:47 +00:00
Julien Desprez
3123fd8930
Mark libvbmeta_test as not unit tests
...
Test: presubmit
Bug: 177906739
Change-Id: I6b49a0af19a652fbe507df2a3f82502a70bec988
2021-01-22 09:04:42 -08:00
Yo Chiang
d542910553
adb remount -R should enable DSU if suitable
...
If executing `adb remount -R` and DSU is running but disabled, then
enable the DSU (one-shot mode) so that the reboot afterwards would stay
within the DSU guest system.
Normally reboot within a DSU guest system would bring the device back to
the host system. However when doing adb remount -R, we actually doesn't
want to exit DSU, but wish to reboot back into DSU guest system again
with remount machinery (overlayfs) properly set up.
Also sort the header include order.
Bug: 165925766
Test: Within a DSU guest system, DSU disabled, adb remount -R
=> After reboot, system is DSU and overlayfs is mounted
Test: adb-remount-test.sh within DSU guest system
Change-Id: I72a7a568e985b183d357ae6e1a7d0113e9921200
2021-01-22 22:15:10 +08:00
I-Chih Lu
6f01bf3c10
Merge "Secure DPU: add folder for common headers" am: e0826c75df am: 6e35140f05 am: 2e6b4f3ad1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556719
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51da58927a734c224e06d4800e9386b110d03923
2021-01-22 09:53:50 +00:00
I-Chih Lu
2e6b4f3ad1
Merge "Secure DPU: add folder for common headers" am: e0826c75df am: 6e35140f05
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556719
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I931bb4543673fcc9d8cc3878c94dd572bc64737a
2021-01-22 09:19:55 +00:00
I-Chih Lu
6e35140f05
Merge "Secure DPU: add folder for common headers" am: e0826c75df
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556719
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86421b1ba8e878657afc114dd9eafc7c5819e4cf
2021-01-22 08:47:50 +00:00
I-Chih Lu
e0826c75df
Merge "Secure DPU: add folder for common headers"
2021-01-22 08:13:42 +00:00