Christopher Ferris
783dea9e00
Merge "Remove define of SA_EXPOSE_TAGBITS." into main am: 57b902c32d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3271864
Change-Id: I7c2668a09ea1dacdf7220e505e136951e52deacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:42:43 +00:00
Christopher Ferris
57b902c32d
Merge "Remove define of SA_EXPOSE_TAGBITS." into main
2024-09-19 16:40:04 +00:00
Christopher Ferris
cfdfb32d13
Remove define of SA_EXPOSE_TAGBITS.
...
This is in the uapi headers now.
Test: Builds and treehugger.
Change-Id: I0dcebeec722ae2835a1054ee8b39329cd06799d4
2024-09-19 02:04:16 +00:00
Shengsong Tan
5a8a1d704a
Merge "Remove usage of base/string/* in libfs_avb" into main am: 752112003d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3265051
Change-Id: Iceb8689b1643eb1cdc2d4b6d118988bf1364da2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 11:32:31 +00:00
Shengsong Tan
752112003d
Merge "Remove usage of base/string/* in libfs_avb" into main
2024-09-18 11:15:16 +00:00
Jerry Chang
14ca137226
Merge "Add input event profile to mitigate input latency of input threads" into main am: 2f84febec1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3153797
Change-Id: I8ae3c63432b8df41947d016eb21cf102777d4028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 11:06:44 +00:00
Jerry Chang
2f84febec1
Merge "Add input event profile to mitigate input latency of input threads" into main
2024-09-18 10:36:32 +00:00
Jerry Chang
72b0186a38
Add input event profile to mitigate input latency of input threads
...
Bug: 347122505
Test: manual dump Perfetto
Change-Id: I224fa31a7358fcd32dfb1c3fa9dec35101e97163
2024-09-18 08:18:42 +00:00
Shengsong Tan
b5d9d909c5
Remove usage of base/string/* in libfs_avb
...
As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.
This CL remove the usage of base/string/* and replace by
android-base/string*
Bug: 360917504
Change-Id: I89e7bdd66bdf8f565f6b2084a70335616a644069
Test: atest libfs_avb_internal_test
2024-09-18 02:11:43 +00:00
Treehugger Robot
913cc05ac2
Merge "Add getFdStateDebug to access Looper's callbacks" into main am: c8e38c0f64
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3267824
Change-Id: Icc00d4aab5c92878abf7183639d5519939488a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 21:02:40 +00:00
Treehugger Robot
c8e38c0f64
Merge "Add getFdStateDebug to access Looper's callbacks" into main
2024-09-17 20:45:05 +00:00
Paul Ramirez
7d9c9af946
Add getFdStateDebug to access Looper's callbacks
...
Added getFdStateDebug to access Looper's internal state.
Flag: EXEMPT testing
Test: TEST=libutils_test; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST --gtest_filter="LooperTest.getFdStateDebug*"
Change-Id: I253ed4a6fa1040053117dcea3be80e55eef9a9b0
2024-09-17 17:40:11 +00:00
Shengsong Tan
3bef60cb64
Merge "Remove usage of base/logging.h in libfs_avb" into main am: e322d54337
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3264992
Change-Id: Iec7fdd6e6881f3a8730efbed529830bf83360b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 11:34:08 +00:00
Shengsong Tan
e322d54337
Merge "Remove usage of base/logging.h in libfs_avb" into main
2024-09-17 11:14:50 +00:00
Treehugger Robot
fe98ade3ba
Merge "libsnapshot: CHECK -> CHECK_EQ" into main am: 007f95d721
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3269744
Change-Id: Icce624aa28b26320ed7c4e3f518b74d25f6b26f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 21:27:28 +00:00
Treehugger Robot
007f95d721
Merge "libsnapshot: CHECK -> CHECK_EQ" into main
2024-09-16 21:04:49 +00:00
Steven Moreland
7b577cf43c
libsnapshot: CHECK -> CHECK_EQ
...
This will print the values of the strings which are not equal
so that we can debug.
Bug: 366531882
Test: build, TH
Change-Id: I36a2b8d3fbda145e07cd8ccb01152a3a3adf21b0
2024-09-16 17:24:25 +00:00
Treehugger Robot
460eda048a
Merge "Define linker.config.json as a filegroup" into main am: 511a1733ec
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261856
Change-Id: I96934255ff27baea5a1573fafc909c95e33572dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 03:42:23 +00:00
Treehugger Robot
511a1733ec
Merge "Define linker.config.json as a filegroup" into main
2024-09-13 03:25:02 +00:00
Christopher Ferris
600d87402c
Merge "Remove unused variable." into main am: bd66ab0a2b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261155
Change-Id: Ie2a5ff0844b01dcf574f2c12228c556df998150d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 00:12:46 +00:00
Christopher Ferris
bd66ab0a2b
Merge "Remove unused variable." into main
2024-09-12 23:54:54 +00:00
Justin Yun
807ab25891
Define linker.config.json as a filegroup
...
The linker.config.json file is required for soong to generate a
system image.
Bug: 365670526
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
&& m
Change-Id: I86389e4143cd2fc08b812d50962bf7ec007894ab
2024-09-12 18:32:47 +09:00
Shengsong Tan
26d10f1584
Remove usage of base/logging.h in libfs_avb
...
As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.
This CL remove the usage of base/logging.h and replace by
android-base/logging.h
Bug: 360917504
Test: atest libfs_avb_internal_test
Change-Id: Ibcc476aebcff2fe5cfc2e3a3cd04168c02bc05f5
2024-09-12 06:44:20 +00:00
Elliott Hughes
5bba23b6e5
Merge "debuggerd: recognize jumps to non-executable memory." into main am: 354bd064a1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3264031
Change-Id: I0d79a0fd468f150e7b396906672625eb68f0209b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 18:59:56 +00:00
Elliott Hughes
354bd064a1
Merge "debuggerd: recognize jumps to non-executable memory." into main
2024-09-11 18:54:46 +00:00
Elliott Hughes
b17d7be2e5
debuggerd: recognize jumps to non-executable memory.
...
We have fairly fancy detection of stack pointer issues, but nothing for the program counter...
Bug: https://issuetracker.google.com/365602121
Change-Id: I7e7061a1b473089a0f31438df5ebc65b283475bc
2024-09-11 16:23:18 +00:00
Elliott Hughes
03f6896b3f
Merge "Remind the reader that they'll need to modify CTS too." into main am: 293b394508
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3262151
Change-Id: Idbce9dba4e5d516528b2553f7bc228ad46005c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 15:24:21 +00:00
Elliott Hughes
293b394508
Merge "Remind the reader that they'll need to modify CTS too." into main
2024-09-11 15:12:22 +00:00
Treehugger Robot
089049b697
Merge "Rename system/core/rootdir/Android.mk to create_root_structure.mk" into main am: 1024225b62
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261831
Change-Id: I6607416db2ff81e12eee1dc1d6234d9d751aba41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 01:05:06 +00:00
Treehugger Robot
1024225b62
Merge "Rename system/core/rootdir/Android.mk to create_root_structure.mk" into main
2024-09-11 01:01:40 +00:00
Terry Guan
835418a761
Merge "init: add a swapoff built-in command" into main am: b9f6c12b4d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257011
Change-Id: I32752a9aa9884a7e3b52085da9cf9596c494daa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 17:06:50 +00:00
Terry Guan
b9f6c12b4d
Merge "init: add a swapoff built-in command" into main
2024-09-10 16:59:46 +00:00
Elliott Hughes
0bec59c496
Remind the reader that they'll need to modify CTS too.
...
Also duplicate the warning to the other set of updatable ids.
Bug: http://b/364993041
Change-Id: I128ddeb468c1f2f872772c9f2505a29f7537eb8a
2024-09-10 15:47:46 +00:00
Nelson Li
c1ad204f85
Rename system/core/rootdir/Android.mk to create_root_structure.mk
...
Since Soong currently doesn't support the `install_directory`
functionality, this file cannot be directly converted to Android.bp.
Moreover, the main content of `system/core/rootdir/Android.mk` is to
create directories and symlinks for the root file system. Therefore,
we'll first rename it and move it to build/core/main.mk for handling.
In addition, consolidate the handling of `meta-lic` related parts into
build/core/tasks/meta-lic.mk.
Bug: 353642907
Test: m -j init.environ.rc
Change-Id: I356c4b05c56b02b0243c12dbeddd4653ba4e137c
2024-09-10 06:50:19 +00:00
Armelle Laine
f2d6acf081
Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into main am: 9ec007acf4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2779372
Change-Id: I1cfeaabaef576a4942c6569a54b43a5bf54ba1ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 04:11:37 +00:00
Armelle Laine
9ec007acf4
Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into main
2024-09-10 04:00:28 +00:00
Arve Hjønnevåg
ced57af116
trusty: keymint/gatekeeper: Pass device name from init scripts
...
If the ro.hardware.trusty_ipc_dev.gatekeeper (respectively .keymint) property is set, pass it as the device name to the gatekeeper (respectively keymint) HALs.
Test: "setprop ro.hardware.trusty_ipc_dev VSOCK:2048:1" and restart HALs
Change-Id: I0947e532ac70ce1821cec49897f21ca10e1af03e
2024-09-10 04:00:09 +00:00
Christopher Ferris
133fc74fa4
Remove unused variable.
...
Test: Builds with -Wunused-variable
Change-Id: Ibe6c28c8dd510303450f8400ba7d721fd5c44fc3
2024-09-09 19:59:06 +00:00
Treehugger Robot
630fce37c3
Merge "trusty: Add host build for rpmb_dev" into main am: e57d3f2110
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3237052
Change-Id: I401bbb100048649aaa0b42ec588d39fcd4cb620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:48:01 +00:00
Treehugger Robot
e57d3f2110
Merge "trusty: Add host build for rpmb_dev" into main
2024-09-09 19:45:16 +00:00
Aditya Kumar
64772590ec
Merge "Fix type of android_thread_func typedef" into main am: c908a97068
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257312
Change-Id: I3ca2f3f706e8d607380eabc8696968b0711e30a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 17:58:41 +00:00
Aditya Kumar
c908a97068
Merge "Fix type of android_thread_func typedef" into main
2024-09-09 17:55:50 +00:00
Xin Li
0eb749c4b0
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ef85e60f5a -s ours
...
am skip reason: Merged-In I8458f223fc35fcfa042588e67a30c5bb273b0277 with SHA-1 a880e5675b is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3258250
Change-Id: Idd9cb60e9bfd42f5e703b21829835f4541664337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:44:33 +00:00
Xin Li
412b87c417
[automerger skipped] Merge 24Q3 to AOSP main am: c25884678a -s ours
...
am skip reason: Merged-In I8458f223fc35fcfa042588e67a30c5bb273b0277 with SHA-1 a880e5675b is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3258250
Change-Id: I62671ab922c8f287078c530dffc4f0fcaced6386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:44:29 +00:00
Xin Li
ef85e60f5a
Merge "Merge 24Q3 to AOSP main" into main
2024-09-07 01:11:50 +00:00
Aditya Kumar
be2cc9f930
Fix type of android_thread_func typedef
...
Found the error with latest clang: https://android-build.corp.google.com/artifact/pending/P80448506/art-host-x86_64/latest/view/logs%2Fbuild_error.log
```
out/soong/.intermediates/system/core/libutils/libutils/linux_glibc_x86_64_static/obj/system/core/libutils/Threads.o system/core/libutils/Threads.cpp
system/core/libutils/Threads.cpp:149:21: error: cast from 'android_thread_func_t' (aka 'int (*)(void *)') to 'android_pthread_entry' (aka 'void *(*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-mismatch]
149 | (android_pthread_entry)entryFunction, userData);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
Change-Id: Ie2423a568483c975a36a1fa0b06a3f93a27be5aa
2024-09-06 15:33:08 -07:00
terryguan
4399754035
init: add a swapoff built-in command
...
Enables a method for swapping off certain block devices or files. This
will be used before hibernation occurs.
Bug: 339688542
Test: Manual, verified that calling swapoff from a init file swapsoff
location that is specified
Change-Id: I212a6f303a023c3e440b557caae82ad3904ac9c9
2024-09-06 08:49:04 -07:00
Treehugger Robot
bacf172ff1
Merge "Reland Skip F2FS formatting for dev option enabled devices" into main am: 06e832372a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257851
Change-Id: Ibf6883231139c1f58965c518deff140642a46794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 06:05:05 +00:00
Treehugger Robot
06e832372a
Merge "Reland Skip F2FS formatting for dev option enabled devices" into main
2024-09-06 06:01:03 +00:00
Treehugger Robot
2037a1d4c8
Merge "snapshotctl: Check device for -img path" into main am: 536aa62490
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3257311
Change-Id: I0930a0d6302044ec670211152765b291d02a479c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 01:26:31 +00:00