Nate Myren
19ce293596
Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main am: cdd4cb7db8
am: 203b44e3ab
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107399
Change-Id: I13565eb63e5cd35144758817a487a4beb00eeb43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:45:46 +00:00
Nate Myren
203b44e3ab
Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main am: cdd4cb7db8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107399
Change-Id: I1e5f25f678f79fb61a35cc3980ec0151367f5ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:38:56 +00:00
Nate Myren
cdd4cb7db8
Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main
2024-05-31 01:31:38 +00:00
Android Build Coastguard Worker
f34ddd66be
Snap for 11908474 from eef9b96668
to 24Q3-release
...
Change-Id: I7b0ed02054a0e771dd04f204cf71c204b72f9ecf
2024-05-30 23:24:56 +00:00
Treehugger Robot
793b36a40c
Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main am: 276eabe757
am: a25e7949d8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3109578
Change-Id: Ic392414872a967d47a1159371164dc54c76b8457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 21:33:22 +00:00
Treehugger Robot
a25e7949d8
Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main am: 276eabe757
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3109578
Change-Id: I62cd5ad2dcf2be9ff207776486abaa3e01bf8722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 21:27:28 +00:00
Treehugger Robot
276eabe757
Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main
2024-05-30 21:25:26 +00:00
Kelvin Zhang
915f32d892
Revert^2 "Set ro.fstype.data when /data is mounted"
...
062eb59a83
Change-Id: I20c4d4c17e4a314eb8754ed9c03db3dd8e3a5d0f
2024-05-30 19:11:11 +00:00
Kiyoung Kim
ed92eabfbb
Make public.libraries.android.txt available to filesystem
...
public.libraries.android.txt was not installable as it was used only
from microdroid. However, this module can also be used from system
image, as there is no difference from the content. This change marks the
module as no_full_install, so it can be installed in the system image
defined in Android.bp
Bug: 343357947
Test: AOSP CF build succeeded
Change-Id: I15fd47b173b5b718972a6ee18b3aecb58826909c
2024-05-30 16:06:43 +09:00
Peter Collingbourne
eef9b96668
Merge "Add fs_config entry for *.rc files." into main am: 68cf5b2239
am: 3a3b79b02e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107404
Change-Id: I721d6d6e6367883e744f8ebf684eb8b26a02cf67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 01:11:01 +00:00
Peter Collingbourne
3a3b79b02e
Merge "Add fs_config entry for *.rc files." into main am: 68cf5b2239
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107404
Change-Id: Iab2aee8f19db72b09ee03a57b8e2e3128063b635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 01:02:32 +00:00
Peter Collingbourne
68cf5b2239
Merge "Add fs_config entry for *.rc files." into main
2024-05-30 00:54:48 +00:00
Priyanka Advani
81d0b4e2bb
Merge "Revert "Set ro.fstype.data when /data is mounted"" into main am: 58a38f4681
am: 9d2cb32a10
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107408
Change-Id: I9d07877d7f0e778aa1e8467c96b7eb4248ce8657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 00:09:17 +00:00
Priyanka Advani
9d2cb32a10
Merge "Revert "Set ro.fstype.data when /data is mounted"" into main am: 58a38f4681
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107408
Change-Id: I56adc205d715ce78206bb16a5cad11d4c721470f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 00:01:30 +00:00
Priyanka Advani
58a38f4681
Merge "Revert "Set ro.fstype.data when /data is mounted"" into main
2024-05-29 23:58:59 +00:00
Kelvin Zhang
062eb59a83
Revert "Set ro.fstype.data when /data is mounted"
...
Revert submission 3095293-fstype
Reason for revert: breaks build cf_x86_64_only_phone-next-userdebug
Reverted changes: /q/submissionid:3095293-fstype
Change-Id: I2d1b2561ec7a3d8ea954b375153dce1a936d0294
2024-05-29 23:26:19 +00:00
Android Build Coastguard Worker
835ca9f9e3
Snap for 11902131 from 872fc2a5e6
to 24Q3-release
...
Change-Id: I6ce5de92f4eaa2310bbe6bfa4b3dd6a71c92697d
2024-05-29 23:25:23 +00:00
Treehugger Robot
b50e48ba73
Merge "Set ro.fstype.data when /data is mounted" into main am: ac7923211e
am: 6c9a542d80
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095293
Change-Id: I7d82d1de5dac3ae4c048cf4e90b422d70b241dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:45:18 +00:00
Daniel Zheng
70c77a5cf6
Merge changes I115b6b98,Iff84c0df,Ice13f58e,I5302a9a2 into main am: 0381ebefc4
am: bee4b39116
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3102278
Change-Id: Ic687deff061cd090955228d25ac31a8012a70fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:32:34 +00:00
Seth Moore
dd5378492d
Merge "Use shared trusty OWNERs file" into main am: 24e39aff4a
am: edffb526ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107017
Change-Id: Ic26279e63d2468db35879a1c0f17d6566a089315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:24:03 +00:00
Treehugger Robot
b9b4af5aa4
Merge "init: 'user root' check use vendor API" into main am: 0b64326377
am: ee8cbde0d5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3106173
Change-Id: I893dea55ae90d0c62f8fe05d38cfe66d7b97d4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:21:59 +00:00
Tomasz Wasilczyk
cf084ec4de
Merge "Fix libutils_binder_sdk build warnings" into main am: 50095020db
am: ae41e96e6c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3068371
Change-Id: I21d099734414b4d86e014775ebce4a8c28f43607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:38 +00:00
Peter Collingbourne
49ecca71b5
Add fs_config entry for *.rc files.
...
Android init will refuse to read files that are world writable. Since
adb push makes files world writable by default, this means that adb
pushed rc files cannot be read by init. Fix it by adding an fs_config
entry for *.rc that sets their permissions to 644 root:root.
Bug: 343370899
Change-Id: If9c4dd4796caae6d177d9fdeef880949e5639648
2024-05-29 14:24:52 -07:00
Treehugger Robot
6c9a542d80
Merge "Set ro.fstype.data when /data is mounted" into main am: ac7923211e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095293
Change-Id: I416213952c9c7dcf64e2b04504696b83211ab10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 17:54:59 +00:00
Treehugger Robot
ac7923211e
Merge "Set ro.fstype.data when /data is mounted" into main
2024-05-29 17:49:18 +00:00
Daniel Zheng
bee4b39116
Merge changes I115b6b98,Iff84c0df,Ice13f58e,I5302a9a2 into main am: 0381ebefc4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3102278
Change-Id: I65ae60b1dc83c4a854105df9a3eca9c745150d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 17:46:52 +00:00
Daniel Zheng
0381ebefc4
Merge changes I115b6b98,Iff84c0df,Ice13f58e,I5302a9a2 into main
...
* changes:
libsnapshot: set num merge threads
snapshot_proto add build configuration variables
update supported compression methods
libsnapshot: get read_ahead_size from build
2024-05-29 17:29:31 +00:00
Seth Moore
edffb526ef
Merge "Use shared trusty OWNERs file" into main am: 24e39aff4a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107017
Change-Id: I16b53a559819cb4fb021ade613815af24ed295f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 15:20:26 +00:00
Seth Moore
24e39aff4a
Merge "Use shared trusty OWNERs file" into main
2024-05-29 15:01:19 +00:00
Treehugger Robot
ee8cbde0d5
Merge "init: 'user root' check use vendor API" into main am: 0b64326377
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3106173
Change-Id: I1f20277188932b6520cfbc80c9c5b79235c1a271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 13:45:09 +00:00
Treehugger Robot
0b64326377
Merge "init: 'user root' check use vendor API" into main
2024-05-29 13:27:16 +00:00
Tomasz Wasilczyk
872fc2a5e6
Merge "Mark libutils_binder_sdk as snapshot supported" into main am: e028a195d0
am: fd32d478ae
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3079719
Change-Id: I0c33dd7a19c3779d28f326c098719567f1e98f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:03:02 +00:00
Steven Moreland
5088e588f7
init: 'user root' check use vendor API
...
This changes user root to use the year date format
that vendor API uses.
Previously this still applied to V devices, which switched
to using API level 202404 after 35.
They recommend the year/date form, and there is no
constant for this.
Bug: 340953047
Test: service_test
Change-Id: I5ba8d1251c877a785e41f0cfcc35d7cb0776f8c7
2024-05-29 00:05:26 +00:00
Nate Myren
b9e0545c85
Revert^2 "Only write appcompat properties if flag is defined"
...
This reverts commit 6d8304aa46
.
Reason for revert: resubmission
Change-Id: Ifb66efa2b1b7a734302316259690950306af99ec
2024-05-28 23:40:59 +00:00
Android Build Coastguard Worker
78406dc585
Snap for 11896415 from 91c96f323a
to 24Q3-release
...
Change-Id: I27bc679c023a9d13b504c3366b5b1dfc2a9d09b3
2024-05-28 23:25:17 +00:00
Seth Moore
b1a58e12dd
Use shared trusty OWNERs file
...
Change-Id: I20f118c39927f56890a37eaa059249db5285e59b
2024-05-28 23:00:10 +00:00
Tomasz Wasilczyk
ae41e96e6c
Merge "Fix libutils_binder_sdk build warnings" into main am: 50095020db
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3068371
Change-Id: Ia9560b4da614bd82b429820003f25f3867d8a287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 20:28:45 +00:00
Tomasz Wasilczyk
fd32d478ae
Merge "Mark libutils_binder_sdk as snapshot supported" into main am: e028a195d0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3079719
Change-Id: Id78ceb1e847391876fa9d6d93e88c730414c20eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 20:28:23 +00:00
Tomasz Wasilczyk
50095020db
Merge "Fix libutils_binder_sdk build warnings" into main
2024-05-28 20:13:03 +00:00
Tomasz Wasilczyk
e028a195d0
Merge "Mark libutils_binder_sdk as snapshot supported" into main
2024-05-28 20:11:34 +00:00
Snehal Koukuntla
91c96f323a
Merge "[Trusty][Metrics] Update struct to add is_crash on the NS side" into main am: 82bc07f911
am: 7fa461ff90
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3085146
Change-Id: If10750bb3a0c93743b285e7baf9a8bed036cc8f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 17:37:58 +00:00
Snehal Koukuntla
7fa461ff90
Merge "[Trusty][Metrics] Update struct to add is_crash on the NS side" into main am: 82bc07f911
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3085146
Change-Id: I6001be23f432b395a3a8ee56fe795a8b430ac1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 17:32:33 +00:00
Snehal Koukuntla
82bc07f911
Merge "[Trusty][Metrics] Update struct to add is_crash on the NS side" into main
2024-05-28 17:14:31 +00:00
Tomasz Wasilczyk
0a2a015e39
Fix libutils_binder_sdk build warnings
...
-Wclass-memaccess
-Winvalid-offsetof
-Wsequence-point
-Wzero-as-null-pointer-constant (turned on in ag/4503295)
Bug: 285204695
Test: m libutils_binder_sdk
Change-Id: I5b988f498cb8e0cf04617a4f7fd41ba9970d321d
2024-05-28 09:51:20 -07:00
Tomasz Wasilczyk
7badb51d22
Mark libutils_binder_sdk as snapshot supported
...
Bug: 302718225
Test: https://r.android.com/2803466
Change-Id: I3a26e1c4c63e0ed6de896ef31eb56f3a3a6bba01
2024-05-28 09:49:49 -07:00
Bart Van Assche
5d1ec59647
Merge "Create the /dev/sys/block/by-name/zoned_device symbolic link" into main am: ba9d7116fb
am: 249f1c9be5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3101421
Change-Id: I6092d3dff0a13e1466308b4771d1259a450054f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 15:01:55 +00:00
Bart Van Assche
249f1c9be5
Merge "Create the /dev/sys/block/by-name/zoned_device symbolic link" into main am: ba9d7116fb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3101421
Change-Id: Iaac7520fd7c43b5ec2cbe04a5f57250aced8231c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 14:03:19 +00:00
Bart Van Assche
ba9d7116fb
Merge "Create the /dev/sys/block/by-name/zoned_device symbolic link" into main
2024-05-28 13:47:05 +00:00
Android Build Coastguard Worker
008dc39aab
Snap for 11890100 from cd7aae3cd7
to 24Q3-release
...
Change-Id: Ic779d4ed70a7aa1240e52ea391bec80a89d55a10
2024-05-25 21:24:59 +00:00
Akilesh Kailash
cd7aae3cd7
Merge "create_snapshot: Build the binary as static" into main am: c398bfd879
am: f46889dc60
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3100189
Change-Id: Id3ea2b98c418103bc5903022f6d06b09a5c07612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 06:55:46 +00:00