Commit graph

73533 commits

Author SHA1 Message Date
Yi Kong
53b3b69bda Merge "Enable afdo for libutils" am: fe9b4ed7b8 am: 47707fb6fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: Id8816216bbf7355e8726a992a85b3db83419fc24
2022-01-05 06:27:57 +00:00
Yi Kong
47707fb6fc Merge "Enable afdo for libutils" am: fe9b4ed7b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: I3a507cfa670b1e8d30eef3f83fdf10573c72364a
2022-01-05 06:16:10 +00:00
Yi Kong
fe9b4ed7b8 Merge "Enable afdo for libutils" 2022-01-05 06:00:25 +00:00
David Anderson
f0ee05bf16 Merge "Remove support for AVB 1.0." am: 58e554e7ed am: 05f0e531c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1876217

Change-Id: I713f089b0003b84c1777bfd665df33f55036741b
2022-01-05 04:25:03 +00:00
David Anderson
05f0e531c7 Merge "Remove support for AVB 1.0." am: 58e554e7ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1876217

Change-Id: I3b319be4b566c7fd7490e6b2c252fba2a526af60
2022-01-05 04:13:39 +00:00
David Anderson
58e554e7ed Merge "Remove support for AVB 1.0." 2022-01-05 03:57:20 +00:00
David Anderson
46404dc911 Merge changes I219f956b,I281937e2 am: a216080a63 am: fc8ed5d9d5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935201

Change-Id: I16ebd75b0f0c9878d01ecc217e182c99cc064d2d
2022-01-05 00:39:24 +00:00
David Anderson
fc8ed5d9d5 Merge changes I219f956b,I281937e2 am: a216080a63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935201

Change-Id: Icbc7fa2fac8a085f5a4c4aceae519eff0292cfb1
2022-01-05 00:20:37 +00:00
David Anderson
a216080a63 Merge changes I219f956b,I281937e2
* changes:
  libsnapshot: Fix libsnapshot_fuzzer_test.
  libsnapshot: Fix checks for compression to work with new snapuserd.
2022-01-05 00:02:06 +00:00
Treehugger Robot
152c0607ed Merge "fastboot: Add system_dlkm flashing support" am: 5785297922 am: 9a3cf3080c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1911211

Change-Id: I0c653bb7adc4e3a1b53eace73cd5322714adcb4e
2022-01-04 00:53:58 +00:00
Treehugger Robot
9a3cf3080c Merge "fastboot: Add system_dlkm flashing support" am: 5785297922
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1911211

Change-Id: I7bac00d663d1dc559cf964719ef47cbb191470db
2022-01-04 00:41:51 +00:00
Treehugger Robot
5785297922 Merge "fastboot: Add system_dlkm flashing support" 2022-01-04 00:28:41 +00:00
David Anderson
34b726ddbe libsnapshot: Fix libsnapshot_fuzzer_test.
Rather than fix this up to work in all configurations, just
force-disable snapuserd testing for these tests.

This patch also adds a "UseUserspaceSnapshots" helper to IDeviceInfo so
we can simplify some checks in snapshot.cpp.

Bug: 208944665
Test: libsnapshot_fuzzer_test
Change-Id: I219f956ba09b090158d5ac757ef1f1d137d512e0
2021-12-29 22:17:26 -08:00
David Anderson
1637899632 libsnapshot: Fix checks for compression to work with new snapuserd.
Most checks for compression are used as a gate to decide whether dm-user
is enabled. However, dm-user can now be enabled without compression, so
these checks have to be audited and adjusted.

Once the "old" compression path is removed, these checks will become
simpler.

Bug: 208944665
Test: vts_libsnapshot_test -force_config vab
Change-Id: I281937e26427044f1ef2e1164d86d67e4170163a
2021-12-29 22:17:25 -08:00
Ramji Jiyani
b3ddb534c3 fastboot: Add system_dlkm flashing support
Bug: 200082547
Test: TreeHugger
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I35e081bbe8674c102324d22d440dcc38493ec25b
2021-12-29 21:00:25 +00:00
Alexander Potapenko
54dd1b15c5 [automerger skipped] init.rc: disable creation of bootreceiver tracing instance for kernels >=4.9 and <= 5.4 am: 17b1c428d4 am: 9c75c6983a -s ours
am skip reason: Merged-In I794062741688ebea0e4bc500723a966f8f646ee1 with SHA-1 53cd1e95e7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981481

Change-Id: I2f75db9a9006bcc68debb6bec216e7731121e7d1
2021-12-23 11:21:03 +00:00
Alexander Potapenko
9ba4f6e559 [automerger skipped] Restrict creation of bootreceiver tracing instance to 64-bit systems. am: c81fec7d8e -s ours am: 4edf845185 -s ours
am skip reason: skipped by user glider

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981480

Change-Id: Ib161890a4902dafb83b8820c19dcb9656ec2ae21
2021-12-23 11:21:02 +00:00
Alexander Potapenko
7b1e96edb2 [automerger skipped] init: introduce ro.kernel.version property am: 1c496e94e0 am: 2d64b0cafc -s ours
am skip reason: Merged-In Icec640b8a7150b344d9aa3bc0bdbcdae050c7c45 with SHA-1 1e966fa9f1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981479

Change-Id: I552116b4fb4bfecc9f81d3fc5503419e4394e9ca
2021-12-23 11:21:01 +00:00
Alexander Potapenko
9c75c6983a init.rc: disable creation of bootreceiver tracing instance for kernels >=4.9 and <= 5.4 am: 17b1c428d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981481

Change-Id: Ied7cd88b05e75b7aa5e3333a55cd5524c78ec427
2021-12-23 11:03:53 +00:00
Alexander Potapenko
4edf845185 [automerger skipped] Restrict creation of bootreceiver tracing instance to 64-bit systems. am: c81fec7d8e -s ours
am skip reason: skipped by user glider

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981480

Change-Id: I090ea8262ddfc1da119b3dbf2e61c32bf67a6c9b
2021-12-23 11:03:53 +00:00
Alexander Potapenko
2d64b0cafc init: introduce ro.kernel.version property am: 1c496e94e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15981479

Change-Id: I5f18d4e1e19d01c865ae40ae8e3368d67a3627e0
2021-12-23 11:03:51 +00:00
Yi Kong
6ee028f165 Enable afdo for libutils
Enable PGO (profile guided optimisation) for better performance.

Test: presubmit
Bug: 195134194
Change-Id: If9abecd830573946fc52b28afd7599800367aa09
2021-12-23 15:57:40 +08:00
Maciej Żenczykowski
27627e7450 Merge "Move libipchecksum to frameworks/libs/net." am: fcf3fefe0b am: 81f9294271
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915930

Change-Id: Id74e43380ddb170e6690eb76b776c2f7fc53d9b1
2021-12-17 07:21:26 +00:00
Maciej Żenczykowski
81f9294271 Merge "Move libipchecksum to frameworks/libs/net." am: fcf3fefe0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915930

Change-Id: I16c6d3d32b58a4984a6912e165d4e58e9816c793
2021-12-17 06:56:18 +00:00
Maciej Żenczykowski
fcf3fefe0b Merge "Move libipchecksum to frameworks/libs/net." 2021-12-17 06:34:42 +00:00
Treehugger Robot
ab49f6a46d Merge changes Id0fe51d0,Ie3b3907b am: e0461422e1 am: 2720b7f9e0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927607

Change-Id: I7c3c8a1612e8feb5ff6ba1cae0b70d7de8eab4e3
2021-12-17 01:39:41 +00:00
Treehugger Robot
2720b7f9e0 Merge changes Id0fe51d0,Ie3b3907b am: e0461422e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927607

Change-Id: I6315a7ab8655869ac851932a072feeeb954ff607
2021-12-17 01:21:50 +00:00
Treehugger Robot
e0461422e1 Merge changes Id0fe51d0,Ie3b3907b
* changes:
  Support building diagnose_usb against musl
  Support building fs_mgr against musl
2021-12-17 01:08:29 +00:00
Jiyong Park
f6ccfb9c97 Merge "android::base::ResultError/Error are template classes" am: f5caf5b2e1 am: 3b14b98643
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1918219

Change-Id: I91ac33f066a3884cdf06770b7b9dbf7bce448690
2021-12-17 00:36:54 +00:00
Jiyong Park
3b14b98643 Merge "android::base::ResultError/Error are template classes" am: f5caf5b2e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1918219

Change-Id: Ide2699eef86b2173e96d92f7ad2a6f09c20d1beb
2021-12-17 00:11:10 +00:00
Jiyong Park
f5caf5b2e1 Merge "android::base::ResultError/Error are template classes" 2021-12-16 23:54:16 +00:00
Jonglin Lee
f8294c8bd0 Merge changes from topic "revert-1926977-NUIGVFOGKB" am: 8aa3bf90c9 am: bde7cc1b9c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927603

Change-Id: I8c21ce2bd7480154482aef09482566081f603c52
2021-12-16 23:21:46 +00:00
Jonglin Lee
bde7cc1b9c Merge changes from topic "revert-1926977-NUIGVFOGKB" am: 8aa3bf90c9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927603

Change-Id: I3e85819bfe320ed7dbfaa8c9c1ff732e260451c5
2021-12-16 22:58:26 +00:00
Wei Wang
828c382fa6 Merge "libprocessgroup: fall back to cpuset in get_sched_policy" am: a5247158fb am: 9a576bfca7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922859

Change-Id: I400fd679040147e5e395bbf5e264fdfd1df73c09
2021-12-16 22:52:48 +00:00
David Anderson
cbaf108059 Merge changes I21563564,I2afd6444 am: f3b02fc2db am: 86460ca6cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1926977

Change-Id: I88cf4255a26b0a820d41f67bf5d5e649852d1f94
2021-12-16 22:51:41 +00:00
David Drysdale
b94e86978b Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de am: fb25985712
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047

Change-Id: I53094107c4d086b094253a47681e7ec0c56872cb
2021-12-16 22:42:41 +00:00
Jonglin Lee
8aa3bf90c9 Merge changes from topic "revert-1926977-NUIGVFOGKB"
* changes:
  Revert "libsnapshot: Fix checks for compression to work with new..."
  Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
2021-12-16 22:37:25 +00:00
Colin Cross
9f0e6493e5 Support building diagnose_usb against musl
Support building diagnose_usb against musl by reimplementing
group_member, which doesn't exist in musl and isn't used anywhere
else in the tree.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: Id0fe51d0bd8677561d0bbdb72d3b1a956127a11c
2021-12-16 14:04:06 -08:00
Jonglin Lee
21feb62ea0 Revert "libsnapshot: Fix checks for compression to work with new..."
Revert submission 1926977

Reason for revert: suspect cause of b/211025818
Reverted Changes:
I215635645:libsnapshot: Fix libsnapshot_fuzzer_test.
I2afd64446:libsnapshot: Fix checks for compression to work wi...

Bug: 211025818
Change-Id: I16741798f6e7409ee98a2cb58d070938811e1697
2021-12-16 21:36:56 +00:00
Jonglin Lee
ca00555865 Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
Revert submission 1926977

Reason for revert: suspect cause of b/211025818
Reverted Changes:
I215635645:libsnapshot: Fix libsnapshot_fuzzer_test.
I2afd64446:libsnapshot: Fix checks for compression to work wi...

Bug: 211025818
Change-Id: Ic8b4b20812b13964a061c93a0193ef93b572a045
2021-12-16 21:36:56 +00:00
Colin Cross
5186681f58 Support building fs_mgr against musl
Support building fs_mgr against musl by including the missing
sys/types.h header.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: Ie3b3907b1c60ba550c04e8780f11b7adf09a6471
2021-12-16 12:49:33 -08:00
Wei Wang
9a576bfca7 Merge "libprocessgroup: fall back to cpuset in get_sched_policy" am: a5247158fb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922859

Change-Id: I6a3c8a688761eef51fa2c5ec40e48bf8afeb21b6
2021-12-16 20:44:35 +00:00
Wei Wang
a5247158fb Merge "libprocessgroup: fall back to cpuset in get_sched_policy" 2021-12-16 19:38:54 +00:00
Lorenzo Colitti
ee1e35c1df Move libipchecksum to frameworks/libs/net.
Test: m
Change-Id: I7dfaef630a3415c30025e572a8981fadd44ee5e3
2021-12-16 19:38:01 +00:00
David Anderson
86460ca6cc Merge changes I21563564,I2afd6444 am: f3b02fc2db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1926977

Change-Id: Ic9e68ba8b3ae82eb7f17a7367b8152e919bcec78
2021-12-16 18:50:12 +00:00
David Anderson
f3b02fc2db Merge changes I21563564,I2afd6444
* changes:
  libsnapshot: Fix libsnapshot_fuzzer_test.
  libsnapshot: Fix checks for compression to work with new snapuserd.
2021-12-16 18:35:46 +00:00
David Drysdale
fb25985712 Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047

Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640
2021-12-16 10:44:11 +00:00
David Drysdale
f7eed000de Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" 2021-12-16 09:37:15 +00:00
David Anderson
00c0cb8020 libsnapshot: Fix libsnapshot_fuzzer_test.
Rather than fix this up to work in all configurations, just
force-disable snapuserd testing for these tests.

This patch also adds a "UseUserspaceSnapshots" helper to IDeviceInfo so
we can simplify some checks in snapshot.cpp.

Bug: 208944665
Test: libsnapshot_fuzzer_test
Change-Id: I215635645d49ad21e80af7fe084e25669c64110c
2021-12-15 22:09:05 -08:00
David Anderson
5c1d54e092 libsnapshot: Fix checks for compression to work with new snapuserd.
Most checks for compression are used as a gate to decide whether dm-user
is enabled. However, dm-user can now be enabled without compression, so
these checks have to be audited and adjusted.

Once the "old" compression path is removed, these checks will become
simpler.

Bug: 208944665
Test: vts_libsnapshot_test -force_config vab
Change-Id: I2afd644464935c965d1b84205ef54ca605d32d78
2021-12-15 22:09:05 -08:00