Commit graph

67552 commits

Author SHA1 Message Date
Marco Ballesio
ac736fe80a Merge "Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"" am: 38eaa32494
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f3356c8eb42abe3d71bdb3134fb98cbbdc636af
2021-01-27 17:08:19 +00:00
Marco Ballesio
38eaa32494 Merge "Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"" 2021-01-27 16:40:02 +00:00
Marco Ballesio
a1a0497984 Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"
4bbabe4ca4

Change-Id: I6742ffd19a6ea1fe3bf6b4386da69f5885b13be4
2021-01-27 06:07:25 +00:00
Treehugger Robot
5850f8efd6 Merge "ueventd: deprecate paths without /etc/" am: 587f5e922c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe9c6c124c84683240982210ba04804d9e7b3f06
2021-01-27 00:48:53 +00:00
Treehugger Robot
405bb6ed44 Merge "Make second stage init visible to microdroid" am: e8cc75f059
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I290271adf3c69426146ec1b56c19acebc848ffd3
2021-01-27 00:47:27 +00:00
Treehugger Robot
587f5e922c Merge "ueventd: deprecate paths without /etc/" 2021-01-26 23:53:54 +00:00
Treehugger Robot
e8cc75f059 Merge "Make second stage init visible to microdroid" 2021-01-26 23:47:46 +00:00
Tom Cherry
71dd7064cc ueventd: deprecate paths without /etc/
ueventd.rc scripts belong in the /etc/ directory of their given
partition, not the root of the partition.  This can cause problems,
especially since Android.bp cannot write to the root directly, forcing
vendors to use Android.mk for these files.  Note that
/system/etc/ueventd.rc moved long ago.

Test: Tree-hugger
Change-Id: I2dcaafc3c3f687f76ab6bc38af979c8b43346db0
2021-01-26 12:26:09 -08:00
Treehugger Robot
72cca38225 Merge "Revert "first_stage_mount: Create snapshot devices before launching first_stage_console"" am: f2d359cbaa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71ba8abee9bbcdccdde2192d4550655bb54502c1
2021-01-26 18:27:24 +00:00
Treehugger Robot
f2d359cbaa Merge "Revert "first_stage_mount: Create snapshot devices before launching first_stage_console"" 2021-01-26 18:00:24 +00:00
Jerome Gaillard
08c44cc1ce Merge changes from topic "revert-1556807-tombstone_proto-NRGSMJBETL" am: 96cb0fd9e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560035

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I407316bd0919f509b37b59009c8b374554c8c358
2021-01-26 17:10:07 +00:00
Jerome Gaillard
96cb0fd9e5 Merge changes from topic "revert-1556807-tombstone_proto-NRGSMJBETL"
* changes:
  Revert "tombstoned: switch from goto to RAII."
  Revert "tombstoned: make it easier to add more types of outputs."
  Revert "tombstoned: support for protobuf fds."
  Revert "libdebuggerd: add protobuf implementation."
  Revert "Fix build breakage."
2021-01-26 16:49:53 +00:00
Jerome Gaillard
e156ede145 Revert "tombstoned: switch from goto to RAII."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: I8a77f6b9e1b42902ef7ee250cc3f1fd341ea0e2b
2021-01-26 12:42:09 +00:00
Jerome Gaillard
eda96eddcb Revert "tombstoned: make it easier to add more types of outputs."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: Ib2403c1b61f6cf0513b76361440fbc5909d7554a
2021-01-26 12:42:03 +00:00
Jerome Gaillard
5ec54d1e84 Revert "tombstoned: support for protobuf fds."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: I0c4f3a17e8b06d6c65255388c571ebf11d371dbb
2021-01-26 12:41:52 +00:00
Jerome Gaillard
1e45d3f223 Revert "libdebuggerd: add protobuf implementation."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: Ia0a1ee57e7630e01c495dc166218f665340aad7f
2021-01-26 12:41:20 +00:00
Jerome Gaillard
a50f61f8fa Revert "Fix build breakage."
This reverts commit 675cb30f05.

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Change-Id: I82d228f2bc3e6b426d4703732e1c8766815ccc97
2021-01-26 12:40:51 +00:00
Yiwei Zhang
4c467e3c15 Revert "first_stage_mount: Create snapshot devices before launching first_stage_console"
This reverts commit 9583e92257.

Reason for revert: <fail to flash a device>
Bug: 178433260

Change-Id: I0e9ab3eff38ddf9ad420cf1479eca16f6f29d1b5
2021-01-26 06:00:46 +00:00
Julien Desprez
828430e7e7 Merge "Attempt to make libavb test working in CI" am: a28b67e9b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557214

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2436a150ccafeb59bf815b5b8cec0514df68b46f
2021-01-26 02:15:32 +00:00
Julien Desprez
a28b67e9b6 Merge "Attempt to make libavb test working in CI" 2021-01-26 02:00:03 +00:00
David Anderson
0660db3ce3 Merge changes I2db0e626,Ic69fc2f5 am: ea1f0fa006
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1559877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3948ce761cb08cdde75cb853d691783562f72068
2021-01-26 00:47:37 +00:00
Akilesh Kailash
3beac907b3 Merge "libsnapshot: Add unit test to simulate merge-resume" am: 1d9a7adc67
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1559110

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fe6aefce9d0826c650fff7ed7f98790a749a621
2021-01-26 00:46:58 +00:00
David Anderson
ea1f0fa006 Merge changes I2db0e626,Ic69fc2f5
* changes:
  libsnapshot: Only mount snapshots in MapAllSnapshots().
  libsnapshot: Do not attempt compression features in recovery.
2021-01-26 00:35:58 +00:00
Akilesh Kailash
1d9a7adc67 Merge "libsnapshot: Add unit test to simulate merge-resume" 2021-01-26 00:09:36 +00:00
Josh Gao
1adafffb79 Merge "Fix build breakage." am: baa2ffe2fd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890857e6a6b65643992ab2ef50a4b8edb843f05d
2021-01-25 23:42:43 +00:00
Josh Gao
baa2ffe2fd Merge "Fix build breakage." 2021-01-25 23:16:49 +00:00
Josh Gao
675cb30f05 Fix build breakage.
Test: mma
Test: treehugger
Change-Id: I2d08c9b6e7776e69ca1e7f0d83838830f3c9b15c
2021-01-25 15:11:49 -08:00
Josh Gao
98cc1fe3bc Merge changes from topic "tombstone_proto" am: 6bf6a9fc61
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515703

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie172fb31687ea194d9480ae22a4d653611ea3b86
2021-01-25 22:24:11 +00:00
Josh Gao
e95f6c848c tombstoned: support for protobuf fds. am: 1091d24c16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f8d3d74a2b40897a6d2410fa433fc1567da6deb
2021-01-25 22:24:08 +00:00
Josh Gao
3aafc1b642 tombstoned: make it easier to add more types of outputs. am: e2aa621c83
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3733591ac71fefddaaa26d7d1a5987467c459ef2
2021-01-25 22:24:04 +00:00
Josh Gao
42c22410fc tombstoned: switch from goto to RAII. am: 9a61f685d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf4f45917c81bcf0fe5739298dc19d9e8a62478d
2021-01-25 22:23:52 +00:00
Josh Gao
6bf6a9fc61 Merge changes from topic "tombstone_proto"
* changes:
  libdebuggerd: add protobuf implementation.
  tombstoned: support for protobuf fds.
  tombstoned: make it easier to add more types of outputs.
  tombstoned: switch from goto to RAII.
2021-01-25 22:18:48 +00:00
David Anderson
5283ae4a86 libsnapshot: Only mount snapshots in MapAllSnapshots().
By accident, this was mounting partitions as well, which caused
conflicts in partial updates where some partitions don't have snapshots.

Test: update_device.py with partial OTA
Change-Id: I2db0e6269f0a02cbe8164fa2a72b887c352f56d8
2021-01-25 13:55:59 -08:00
David Anderson
71ab9dbeba libsnapshot: Do not attempt compression features in recovery.
Test: adb sideload
Change-Id: Ic69fc2f5c37a5d4fc0fcd0819ebf58e0249f7773
2021-01-25 13:54:45 -08: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
Julien Desprez
f8d9765e0a Attempt to make libavb test working in CI
Test: presubmit
Bug: 178215452
Change-Id: I82d847e05a2fddf3037a8f97793e24a593230ba7
2021-01-25 18:02:12 +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
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
Jiyong Park
903537884f Make second stage init visible to microdroid
microdroid is the base image for on-device VMs. We will use Android
components (init, adbd, servicemanager, ...) on the VM as much as
possible.

Bug: 177630284
Test: m microdroid
Change-Id: I36890644baaaf8f441698411dd869ddb220734fb
2021-01-25 19:12:17 +09: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
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