Commit graph

89572 commits

Author SHA1 Message Date
Donnie Pollitz
63ef65c138 Merge "storageproxyd: Add arguments for storage mapping and max file" into main 2024-04-22 18:20:44 +00:00
Treehugger Robot
5bf2c8f606 Merge "init.rc: remove 4.9/4.14 support" into main am: 6901df0eb3 am: 36ab67d1c1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3050402

Change-Id: Ief02ed4374a4bcb48dad47921042e073561d26a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 18:04:17 +00:00
Treehugger Robot
6e377fd1b0 Merge "init.rc: remove xt_qtaguid configuration" into main am: dd8050f68a am: 135b745d69
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048025

Change-Id: Idb8e881bfa9e712beb120a23a6dd6986952fc4a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 17:57:54 +00:00
Treehugger Robot
36ab67d1c1 Merge "init.rc: remove 4.9/4.14 support" into main am: 6901df0eb3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3050402

Change-Id: I6bf4143eeec6cda371d1554270afe246d6c89f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 17:43:40 +00:00
Treehugger Robot
135b745d69 Merge "init.rc: remove xt_qtaguid configuration" into main am: dd8050f68a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048025

Change-Id: Ie7ba4c21fe60903cc25506fbc1d18600a9bafe19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 17:39:47 +00:00
Treehugger Robot
6901df0eb3 Merge "init.rc: remove 4.9/4.14 support" into main 2024-04-22 17:01:10 +00:00
Treehugger Robot
dd8050f68a Merge "init.rc: remove xt_qtaguid configuration" into main 2024-04-22 16:57:47 +00:00
Treehugger Robot
4dfad3a25f Merge "Build init-debug.rc with Soong" into main am: 95403fce00 am: 53ae0cb479
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048221

Change-Id: I831e6a8f4f2442a395f87fd3dec35c463cd0ed0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 16:54:05 +00:00
Treehugger Robot
53ae0cb479 Merge "Build init-debug.rc with Soong" into main am: 95403fce00
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048221

Change-Id: I8b5be00324c5382e8b58ebd170dcb5ce2c6412ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 16:44:18 +00:00
Treehugger Robot
6738f07310 Merge "setprop: check if not setprop value but setprop name starts with "ro."" into main am: ff086da560 am: 03bf52f995
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048227

Change-Id: I2411a9f1bf31be474798751aebebbfee676a7a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 16:43:46 +00:00
Treehugger Robot
95403fce00 Merge "Build init-debug.rc with Soong" into main 2024-04-22 16:28:28 +00:00
Treehugger Robot
03bf52f995 Merge "setprop: check if not setprop value but setprop name starts with "ro."" into main am: ff086da560
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048227

Change-Id: If7ed28450c5e5cc822859440419f78db1f45c60c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 16:19:29 +00:00
Treehugger Robot
ff086da560 Merge "setprop: check if not setprop value but setprop name starts with "ro."" into main 2024-04-22 15:59:44 +00:00
sanga1.lee
2c6b83f4d2 setprop: check if not setprop value but setprop name starts with "ro."
When setting property with setprop, a property name which starts with
"ro." could be set no matter how long the value name is.

Change-Id: Ia035ef009952db08ae8a6d4a2b8b9567d86124fc
2024-04-22 08:07:52 +00:00
Maciej Żenczykowski
a95be37d2c init.rc: remove 4.9/4.14 support
U requires 4.14+
V requires 4.19+

as such this is no longer useful

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I39d01cc16897c6c9174cf074e27c888bc758f1cc
2024-04-20 07:06:54 +00:00
Maciej Żenczykowski
8b29034b89 init.rc: remove xt_qtaguid configuration
which has been fully replaced by eBpf
(started in android P, finished in android S)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie38e54600a9bb01c7ecdde63d9a9256bed047f41
2024-04-20 06:58:05 +00:00
Treehugger Robot
8d569c3c4f Merge "Null terminate the std::array given to execve" into main am: f0db2406f7 am: 0f57386772
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3049294

Change-Id: Ib829f57af0d74c80fb21f23c7dc0bd76d8af26d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-20 03:17:37 +00:00
Treehugger Robot
0f57386772 Merge "Null terminate the std::array given to execve" into main am: f0db2406f7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3049294

Change-Id: Ifd901bdd276d25dd5f50e5d04184a1c132d016a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-20 03:02:57 +00:00
Treehugger Robot
f0db2406f7 Merge "Null terminate the std::array given to execve" into main 2024-04-20 02:41:34 +00:00
Jiyong Park
e873e1d31b Null terminate the std::array given to execve
std::array<T, N> takes exactly N * sizeof(T) bytes, leaving no room for
the null terminator.

Bug: 335047945
Test: re-run the GSI test
Change-Id: Ic3aca5f409021c78a7eb965c5ed610e6a51e42cb
2024-04-20 10:11:46 +09:00
Nate Myren
32677ae8f3 Only write appcompat properties if flag is defined
Only writes the appcompat properties if the
WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES cflag is defined

Fixes: 331307495
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f04f6bae4314e01111045ba231010ba7067477a0)
Merged-In: Ie99b5027a9704c0f4f7fe4d3a6a6cf49f4bb8176
Change-Id: Ie99b5027a9704c0f4f7fe4d3a6a6cf49f4bb8176
2024-04-19 19:07:52 +00:00
Daniel Zheng
885bd1c8d6 libsnapshot: remove hard coded cow version
Remove hard coded global variables referencing cow version in
libsnapshot. This value should stem from the build system, or set
individually in test cases.

Bug: 307452468
Test: th
Change-Id: I3d536246008acca92cd93e77886e5f7d17a131e0
2024-04-19 11:39:46 -07:00
Inseob Kim
4113b658a8 Build init-debug.rc with Soong
Bug: 335369205
Test: build and compare
Change-Id: Idb6105e8527e3a2b4f0517b31be3fa8b78826880
2024-04-19 16:17:14 +09:00
Inseob Kim
35b90ee2cd Merge "Build etc/hosts with Soong" into main am: 8c7b66629d am: b4aad899b4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046094

Change-Id: If2872de6d6fc2e1f70dcca0f861315085e0c241b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 02:07:43 +00:00
Inseob Kim
b4aad899b4 Merge "Build etc/hosts with Soong" into main am: 8c7b66629d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046094

Change-Id: I8d651dd6ed5f8a46e3742e11913a00f5c9c6d407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 01:44:21 +00:00
Inseob Kim
8c7b66629d Merge "Build etc/hosts with Soong" into main 2024-04-19 01:29:38 +00:00
Treehugger Robot
a95ac7a617 Merge changes Ie74b9c27,If2224475 into main am: b45c8ad05b am: 66c0975a94
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048853

Change-Id: I774ee017112376db2ba922123fed4eb1019bcc7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 19:45:21 +00:00
Treehugger Robot
66c0975a94 Merge changes Ie74b9c27,If2224475 into main am: b45c8ad05b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048853

Change-Id: I5f2dfc1f1a2b2b62da550d30e2ea656229159682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 19:28:28 +00:00
Treehugger Robot
b45c8ad05b Merge changes Ie74b9c27,If2224475 into main
* changes:
  libprocessgroup: Check validity of uid and pid arguments for createProcessGroup
  Revert "libprocessgroup: Check validity of uid and pid arguments"
2024-04-18 19:09:18 +00:00
Julien Desprez
f0485a6d1c Merge "snapshotctl: Check for cow path when allocated from /data" into main am: a078141ec8 am: 8a74ce94fa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3047795

Change-Id: Ia9c300cb057bd2a79fcfb30de1872078f146fcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 18:57:43 +00:00
Julien Desprez
8a74ce94fa Merge "snapshotctl: Check for cow path when allocated from /data" into main am: a078141ec8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3047795

Change-Id: I8d6e998971cfa5fd1d6517efeb718e287c7abef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 18:30:37 +00:00
Julien Desprez
a078141ec8 Merge "snapshotctl: Check for cow path when allocated from /data" into main 2024-04-18 18:13:55 +00:00
T.J. Mercier
7d9d171e4e libprocessgroup: Check validity of uid and pid arguments for createProcessGroup
killProcessGroup already checks for validity of the uid and pid input
arguments. Also add this checking to createProcessGroup.

Bug: 333261173
Change-Id: Ie74b9c2716978cb5eb434af12e27945e29af876e
2024-04-18 16:18:22 +00:00
T.J. Mercier
29e30f25b4 Revert "libprocessgroup: Check validity of uid and pid arguments"
This reverts commit 5a3c3f7ccf.

Don't SIGABRT for invalid requests.

Bug: 333261173
Change-Id: If22244753b43529ed17c315b3732af371827e774
2024-04-18 16:17:48 +00:00
Akilesh Kailash
fa5cf6884a snapshotctl: Check for cow path when allocated from /data
If the COW device is allocated only from /data, then
the COW device name will end with -cow-img. Hence, check
that path as well.

Bug: 335552315
Test: snapshotctl apply-update
Change-Id: Id3c5cf8afd77994da117de41bb98a226b350f8e4
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-04-18 06:19:56 -07:00
Treehugger Robot
846cbd4dc0 Merge "Updated fuzz_config in Android.bp file" into main am: 8a92f2d747 am: 867e73e5f1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3039234

Change-Id: Iecb04d0f0904bded0cd9ade7cc4d783ffc71829c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 02:26:20 +00:00
Treehugger Robot
867e73e5f1 Merge "Updated fuzz_config in Android.bp file" into main am: 8a92f2d747
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3039234

Change-Id: I4c474af90f97566999ef76b68ff5fc80bfcd87c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 02:11:08 +00:00
Treehugger Robot
8a92f2d747 Merge "Updated fuzz_config in Android.bp file" into main 2024-04-18 01:55:15 +00:00
Inseob Kim
f1ddc62db3 Build etc/hosts with Soong
Bug: 335369205
Test: build
Change-Id: I3a33e80dc751ddce874fe1345594e6dc5f27b36c
2024-04-18 10:44:46 +09:00
Treehugger Robot
9274297ba0 Merge "Don't install Android-only dependencies to microdroid" into main am: 68c7869e86 am: a94aef36a7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046155

Change-Id: I378985288c42cad3c78481710be2ca8fce90afd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 23:07:08 +00:00
Treehugger Robot
a94aef36a7 Merge "Don't install Android-only dependencies to microdroid" into main am: 68c7869e86
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046155

Change-Id: I833288719975ee0dab671914e2e3745300e9c3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 22:55:06 +00:00
Treehugger Robot
68c7869e86 Merge "Don't install Android-only dependencies to microdroid" into main 2024-04-17 22:37:56 +00:00
David Drysdale
cc3483733d Merge "Warn that reboot might be needed after setting IDs" into main am: a8934ddc26 am: dd71a1aa75
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046693

Change-Id: I2ce3c644ca9fc7a73811270c4c4c0073b1106ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 18:07:02 +00:00
David Drysdale
dd71a1aa75 Merge "Warn that reboot might be needed after setting IDs" into main am: a8934ddc26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3046693

Change-Id: I6a38724715144f93b1d218d15d7c937865b58528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:37:31 +00:00
David Drysdale
a8934ddc26 Merge "Warn that reboot might be needed after setting IDs" into main 2024-04-17 17:12:08 +00:00
David Drysdale
8005cfa7e4 Warn that reboot might be needed after setting IDs
Test: compile
Change-Id: Iac93f6a60df7e1a9f89183deabb37e0efc16df91
2024-04-17 16:27:49 +01:00
Jiyong Park
12c64a7586 Don't install Android-only dependencies to microdroid
init_second_stage_defaults provides properties that are common to both
Android's init and Microdroid's init. Before this CL, it included
target.product.required and target.recovery.required properties. The
required dependencies were Android-specific; the dependencies included
Android-only init.rc. Microdroid has its own init.rc (microdroid_init_rc
module).

This was problematic but so far it didn't cause an issue because those
Android-only dependencies were not installed to Microdroid due to a bug
in the build system.

As we fix the build system bug, the Android-only dependencies started
get installed to Microdroid, effectively overriding the Microdroid-only
init.rc file. This made Microdroid fail to boot.

Fixing this issue by moving the Android-only dependencies out of the
defaults module and putting them on the Android's init.

In addition to that, this CL removes the recovery variant for the
Microdroid's init because it's not used.

Bug: N/A
Test: run AVF tests
Change-Id: I09748f1123125cac74ce54fd5c360c9a3ba2f996
2024-04-17 14:36:55 +09:00
T.J. Mercier
914e2e0d8e Merge changes from topic "memcg_v2_soong_flags" into main am: 6d6ff398b3 am: bf598a3bbe
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3003302

Change-Id: I6fe43e68784bdae6f8f71a375238fdcfe862057b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 22:16:06 +00:00
T.J. Mercier
bf598a3bbe Merge changes from topic "memcg_v2_soong_flags" into main am: 6d6ff398b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3003302

Change-Id: Ia5288812b84f4c42ee07caea6492c0d67369249a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 21:59:48 +00:00
T.J. Mercier
6d6ff398b3 Merge changes from topic "memcg_v2_soong_flags" into main
* changes:
  Add build flag to split the cgroup v2 hierarchy into apps/system
  Add build flag to force memcg to the v2 cgroup hierarchy
  Use ConvertUid{Pid}ToPath for all path generation
  Fix unused params and remove unneeded cflags
2024-04-16 21:40:38 +00:00