ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
73918 commits 1 branch 0 tags 217 MiB
Commit graph

73918 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Parsons
9beeb511f0 Merge "Remove libdl from shared_libs" am: aa6964861a am: 48c52fc8b8 am: 596ec7e22f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1900970

Change-Id: I45d6421ed6fdcc77fd64892c91f0541ad0d4b47a
 2021-11-29 23:46:26 +00:00
Christopher Parsons
596ec7e22f Merge "Remove libdl from shared_libs" am: aa6964861a am: 48c52fc8b8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1900970

Change-Id: Ifafa4159b765ecd442e65403836d59ec5fb8aa77
 2021-11-29 23:26:38 +00:00
Christopher Parsons
48c52fc8b8 Merge "Remove libdl from shared_libs" am: aa6964861a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1900970

Change-Id: I7ee91b7094c5b588726de1ffe7a6921bf77bcbf0
 2021-11-29 23:08:42 +00:00
Christopher Parsons
aa6964861a Merge "Remove libdl from shared_libs" 2021-11-29 22:48:53 +00:00
Chris Parsons
820da65897 Remove libdl from shared_libs 
This entry is redundant, as system_shared_libs by default includes
libdl.

This should be a no-op change for the current build system, but avoids
an issue on the alternative (experimantal) build system, Bazel.

Test: md5sum libutils.so before/after on aosp_flame, verified no changes
Change-Id: I18f6e67c3e23299a0f1e0ef530a0a809b068dc03
 2021-11-29 17:43:04 -05:00
Treehugger Robot
f3d084b29d Merge "Make libmini_keyctl_static available in recovery" am: 4bbf1c9d24 am: df756edf7d am: 71ce404ceb 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898853

Change-Id: I18859e259d12b6f60f23dfe60d20918e28ea5c65
 2021-11-23 18:48:37 +00:00
Treehugger Robot
71ce404ceb Merge "Make libmini_keyctl_static available in recovery" am: 4bbf1c9d24 am: df756edf7d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898853

Change-Id: I2a08acf96e15600738182efb65c7e189ea63d490
 2021-11-23 18:33:29 +00:00
Treehugger Robot
df756edf7d Merge "Make libmini_keyctl_static available in recovery" am: 4bbf1c9d24 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898853

Change-Id: I96dd0bb7b9a4eaabae7093ab9114879ba0f5bc1c
 2021-11-23 18:15:58 +00:00
Treehugger Robot
4bbf1c9d24 Merge "Make libmini_keyctl_static available in recovery" 2021-11-23 17:54:31 +00:00
Treehugger Robot
f7f66dcd86 Merge "mini_keyctl: add OWNERS" am: a927f51846 am: 30fdd4a371 am: ec8d3e0790 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898857

Change-Id: I76b577fe314e49affcc7446336aa5142f6f4eb2a
 2021-11-23 13:25:33 +00:00
Treehugger Robot
ec8d3e0790 Merge "mini_keyctl: add OWNERS" am: a927f51846 am: 30fdd4a371 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898857

Change-Id: Ibfc66c9f805a5c04e2638ff638f56d45651ab68b
 2021-11-23 13:15:18 +00:00
Treehugger Robot
30fdd4a371 Merge "mini_keyctl: add OWNERS" am: a927f51846 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898857

Change-Id: I62d33cd2bf6baa3a65f9d3e0c70b750f5ceb3827
 2021-11-23 12:46:47 +00:00
Treehugger Robot
a927f51846 Merge "mini_keyctl: add OWNERS" 2021-11-23 12:23:49 +00:00
Jeff Vander Stoep
26083e88e5 mini_keyctl: add OWNERS 
Test: n/a
Change-Id: Ib068ec6658779b2baa0772b5ae3a2e4665caa260
 2021-11-23 11:16:05 +00:00
Treehugger Robot
4f8cf90d84 Merge "Mark fs-verity support for /metadata if first_api_level >= R" am: e33c0e547d am: b48b5d9b93 am: eb3eb18b70 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898850

Change-Id: I8a4895bb5f7b5c85b129dc387cb41ef6acae6673
 2021-11-22 20:59:53 +00:00
Akilesh Kailash
033f59667c Merge changes from topic "vabc-user-snapshots" am: 04eecd441c am: f3b98f4cbd am: 6413fea14d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1885107

Change-Id: I0afb2af35953cc196c3026565c5d47b8f2dc17bb
 2021-11-22 20:59:46 +00:00
Treehugger Robot
eb3eb18b70 Merge "Mark fs-verity support for /metadata if first_api_level >= R" am: e33c0e547d am: b48b5d9b93 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898850

Change-Id: I8e47540f6eab0e7d80acc1d1b917518f45fb44f2
 2021-11-22 20:48:39 +00:00
Akilesh Kailash
6413fea14d Merge changes from topic "vabc-user-snapshots" am: 04eecd441c am: f3b98f4cbd 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1885107

Change-Id: Ic6ac6eeea58bc83eeb8ab1eb5a6937d5f014519a
 2021-11-22 20:48:32 +00:00
Jeff Vander Stoep
3bada5cbcd Make libmini_keyctl_static available in recovery 
So libfsverity_init can be used in init to load fsverity keys in
early boot.

Bug: 199914227
Test: build
Change-Id: I514ab602ef03f4528cb013bd268fa6dfcb7eb5b2
 2021-11-22 21:35:04 +01:00
Treehugger Robot
b48b5d9b93 Merge "Mark fs-verity support for /metadata if first_api_level >= R" am: e33c0e547d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898850

Change-Id: Ie05639d440a005517e9a4609a06b0bc84fcaa8eb
 2021-11-22 20:31:58 +00:00
Akilesh Kailash
f3b98f4cbd Merge changes from topic "vabc-user-snapshots" am: 04eecd441c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1885107

Change-Id: I4a2dc23e7895ae924ad0559bd36411c771cc8a53
 2021-11-22 20:31:36 +00:00
Treehugger Robot
e33c0e547d Merge "Mark fs-verity support for /metadata if first_api_level >= R" 2021-11-22 20:23:44 +00:00
Akilesh Kailash
04eecd441c Merge changes from topic "vabc-user-snapshots" 
* changes:
  snapuserd: Add unit test for test merge code path
  libsnapshot: Add vts_userspace_snapshot_test
  libsnapshot: Integrate userspace snapshots APIs
 2021-11-22 20:16:06 +00:00
Treehugger Robot
6510a5d660 Merge "Configure Trusty KeyMint devices to use attest_keys." am: 1d02ce9ad4 am: 6565f9fcb4 am: 85266386f6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1875215

Change-Id: I07708d59a9e92ea81912ea5d604b1f630c4fee31
 2021-11-22 19:04:57 +00:00
David Anderson
7427a1e870 Merge "overlayfs: Use userxattrs on supporting kernels." am: 92b3b3fff6 am: b833669434 am: d8dc39bef5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897866

Change-Id: I75757e7351a8f56c6678071bab52b57bbf2018ab
 2021-11-22 19:04:45 +00:00
Treehugger Robot
85266386f6 Merge "Configure Trusty KeyMint devices to use attest_keys." am: 1d02ce9ad4 am: 6565f9fcb4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1875215

Change-Id: I6a991747f052f51af4a835b5f08e2603bce51748
 2021-11-22 18:48:12 +00:00
David Anderson
d8dc39bef5 Merge "overlayfs: Use userxattrs on supporting kernels." am: 92b3b3fff6 am: b833669434 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897866

Change-Id: I4baba52e45444d25bff539932c2534de90519749
 2021-11-22 18:47:50 +00:00
Treehugger Robot
6565f9fcb4 Merge "Configure Trusty KeyMint devices to use attest_keys." am: 1d02ce9ad4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1875215

Change-Id: If74e366ead8b86793e9c61e4391d1e8903ce896a
 2021-11-22 18:30:46 +00:00
David Anderson
b833669434 Merge "overlayfs: Use userxattrs on supporting kernels." am: 92b3b3fff6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897866

Change-Id: I77c231fb1e56b513442ba228d10df06e77eed318
 2021-11-22 18:30:31 +00:00
Treehugger Robot
1d02ce9ad4 Merge "Configure Trusty KeyMint devices to use attest_keys." 2021-11-22 18:21:09 +00:00
David Anderson
92b3b3fff6 Merge "overlayfs: Use userxattrs on supporting kernels." 2021-11-22 18:16:10 +00:00
Shawn Willden
b440e0c077 Configure Trusty KeyMint devices to use attest_keys. 
Change-Id: If86133e7648b601a4a61ea5614e6971a2bb8d264
Bug: 197096139
Test: Manual
 2021-11-22 16:52:30 +00:00
Jeff Vander Stoep
eb74938269 Mark fs-verity support for /metadata if first_api_level >= R 
fs-verity is required for new devices launched with R.

This allows files stored on /metadata to be protected by fsverity.

Bug: 199914227
Test: mini-keyctl padd asymmetric fsv-sepolicy .fs-verity \
< /system/etc/security/com.android.sepolicy.cert.der
cp /apex/com.android.sepolicy.apex/app/SEPolicy-33/SEPolicy-33.apk \
/metadata/sepolicy/
fsverity enable /metadata/sepolicy/SEPolicy-33.apk \
--signature=/apex/com.android.sepolicy.apex/etc/SEPolicy-33.apk.fsv_sig

Change-Id: I44434e3d026f1dbe6e261c365b3c70d3556a80b1
 2021-11-22 10:26:51 +01:00
Treehugger Robot
32f79c6e71 Merge "Check vendor namespace for SPHAL namespace" am: ba3ae06a15 am: c8f2724978 am: 5075a2f30c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1895033

Change-Id: Ia453579f98a621ced6e061f546ede68831328ae4
 2021-11-22 09:22:51 +00:00
Treehugger Robot
5075a2f30c Merge "Check vendor namespace for SPHAL namespace" am: ba3ae06a15 am: c8f2724978 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1895033

Change-Id: I098f03319b1c061b260e2d45db22cb284ee00072
 2021-11-22 09:11:38 +00:00
Treehugger Robot
c8f2724978 Merge "Check vendor namespace for SPHAL namespace" am: ba3ae06a15 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1895033

Change-Id: I94aadf19ba77b8aa26f6e39a68ddf0ad9db0e398
 2021-11-22 09:00:02 +00:00
Treehugger Robot
ba3ae06a15 Merge "Check vendor namespace for SPHAL namespace" 2021-11-22 08:47:18 +00:00
Kiyoung Kim
b77377e62f Check vendor namespace for SPHAL namespace 
Vendor APEX section should not separate SPHAL in generic, and also
default namespace does not contain vendor libs in the scope. This change
updates libvndksupport to check 'vendor' namespace when there is no
sphal namespace for vendor APEX section case.

Bug: 193861508
Test: AOSP CF x86_64 boot succeeded
Change-Id: I04cefc12be4c8ec261efb1688a8307b7061bf068
 2021-11-22 10:57:44 +09:00
David Anderson
67c26b25be Merge "init: Add a way to class_restart only enabled services." am: 4993168f9c am: 3927785881 am: 4cc647cf77 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1886238

Change-Id: I7245d982378a8838a4798150a6081faf736a2ceb
 2021-11-20 04:05:56 +00:00
David Anderson
4cc647cf77 Merge "init: Add a way to class_restart only enabled services." am: 4993168f9c am: 3927785881 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1886238

Change-Id: I69fde9e5acbd4d84efc25ffe843d41d5d1d16a41
 2021-11-20 03:49:52 +00:00
David Anderson
3927785881 Merge "init: Add a way to class_restart only enabled services." am: 4993168f9c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1886238

Change-Id: I0f7ef072173ce8347da809d0e99f19360284bcb1
 2021-11-20 03:33:08 +00:00
David Anderson
4993168f9c Merge "init: Add a way to class_restart only enabled services." 2021-11-20 03:16:22 +00:00
David Anderson
70d057448d overlayfs: Use userxattrs on supporting kernels. 
In previous kernels, overlayfs stored its xattrs with a "trusted."
prefix. This requires CAP_SYS_ADMIN. As a workaround, we carried
out-of-tree kernel patches to bypass the security checks on these attrs.

The 5.15 kernel however has a new mount option "userxattr". When this is
set, the "trusted." prefix is replaced with "user.", which eliminates
the CAP_SYS_ADMIN requirement.

On kernels >= 5.15 we can use this feature and drop some of our
out-of-tree patches.

Bug: 204981027
Test: adb remount on cuttlefish with >=5.15
Change-Id: I3f0ca637a62c949fe481eea84f2c682f1ff4517a
 2021-11-19 16:03:52 -08:00
Akilesh Kailash
a781512188 snapuserd: Add unit test for test merge code path 
Most of the test cases are similar to dm-snapshot-merge.

Additional test cases have been added primarily to test
I/O's in parallel with merge.

Bug: 193863397
Test: snapuserd_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I2764e6971989c121be873cc425cac464f31ce85f
 2021-11-19 23:47:26 +00:00
Akilesh Kailash
6e35cb89ff libsnapshot: Add vts_userspace_snapshot_test 
Toggle virtual_ab.userspace.snapshots.enabled to test
both:

1: vts_libsnapshot_test - testing kernel dm-snapshot
2: vts_userspace_snapshot_test - testing user-space snapshot

Bug: 193863443
Test: vts_userspace_snapshot_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I873e7476d71feb9a2e12054e968443bd22ee817c
 2021-11-19 23:47:04 +00:00
Akilesh Kailash
3b874456fc libsnapshot: Integrate userspace snapshots APIs 
dm-user block device will be the snapshot device; thus, no
more explicit call to MapSnapshot(). Additionally, block device
name for dm-user will be the snapshot name so that mount works
seamlessly.

API's to query the snapshot status, merge progress has been
integrated. Since daemon requires base device for merge, we pass
additional parameter during initialization.

Add a new virtual a/b property flag to enable/disable
user-snapshots feature. Propagate this flag to init layer
for first stage mount during boot process.

Some minor cleanup and renaming of variables.

Bug: 193863443
Test: 1: Full OTA on CF and pixel and verify the merge completion.
Tested merge-resume path by rebooting device during merge.
2: Incremental OTA on CF and pixel

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I5088f40a55807946cd044b3987678ead3696d996
 2021-11-19 23:45:43 +00:00
Christopher Ferris
d8e127a8a7 Merge "Remove non-protobuf path." am: bad9f5fd89 am: 7412b62a7f am: b0f3f69e05 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897226

Change-Id: I46dd0aef3f363637f1e35192af7c48099cec13ae
 2021-11-19 19:03:59 +00:00
Christopher Ferris
b0f3f69e05 Merge "Remove non-protobuf path." am: bad9f5fd89 am: 7412b62a7f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897226

Change-Id: I052157bc562eb4622e645e18488d89eb71bb7e18
 2021-11-19 18:53:14 +00:00
Christopher Ferris
7412b62a7f Merge "Remove non-protobuf path." am: bad9f5fd89 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1897226

Change-Id: Ief1a198021cd83702680a246cf3be414579c242f
 2021-11-19 18:36:06 +00:00
Christopher Ferris
bad9f5fd89 Merge "Remove non-protobuf path." 2021-11-19 18:22:46 +00:00