-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IsswAKCRDorT+BmrEO eHLxAJ9VFRJgjolHUwxeYIHRrAxp7WFw0wCeIiUvtF763IeQx6Ri6gz3/i1V9mY= =uE+H -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdYsU0XHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlzEhAAkyT+qSieZv1roFs6MW0sBnjP 60eSCsj/eVetsK91ExBdm+NPHmpFG1XUcwxxiWzlPweIYA+eaECdoP9qngwxH/fy 7m6lxzVx2C9JbSCRWuBmyFWfsm7l+cjDoO8a5QnummBNobhV6/z680+CPzhsXXp5 wQ8cRYLlZEwSMGlgW5KufhbEQISZK1rxWGcx7C0MwoAZybm0V7bcv9ot9XWVZdBI 0uvpZEAYuLqMTTOxd1HNZBKA+cMmWLE+0ALfydGqdHxTkpDXY17Ek4/R3H7KTcy0 mhp6rLQHMKn/atDUsYGvDp/wGs+PWHl9QPXprwj9g9XBNRaAcw/ANi+I/Gc17Qsc X/5DeC0ycGBljhjnl7ZoXAPwLyN+tYZi+ekwBs0E4+uQCLG5AMSLGZHGHcZafXB1 s0pR1u85BxC/7CoVB22J5utjsLdJT0G8bIgfyrKVVIA9iIe9zO/rsMN+9kffrQ9W xPohc1XyVrsQ2b6xk/PyqbAI5mk7+IKKhxhX+Vv2Fczp2OCPuefa1aS1lIv4bZBL rRPlVyodLWsEqxGNhiCo5Hh24uufJGuBTL2w6Rn5/UkqUkvUQZbsRNTg7WQIfcWh sNvuNNxpgsilXFJC0/aoLE557MjCWq4eolPLnyrz3yR3jPcAa269bMuiMXKsVeEd PvjxgQawPY8QkE2woe0= =R9aC -----END PGP SIGNATURE----- Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IsswAKCRDorT+BmrEO # eHLxAJ9VFRJgjolHUwxeYIHRrAxp7WFw0wCeIiUvtF763IeQx6Ri6gz3/i1V9mY= # =uE+H # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:03 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2481 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Akilesh Kailash (13) and others # Via Automerger Merge Worker (317) and others * tag 'android-15.0.0_r6': (158 commits) trusty: storage: proxy: FS_READY property setting on vendor only Fix the trigger name for loading bpf programs. start netd earlier Replace base::RandInt with std::uniform_int_distribution trusty: keymint: rename trusty_ipc_dev property Move the `dist` target of `mke2fs` to `build/core/tasks` Remove define of SA_EXPOSE_TAGBITS. Add input event profile to mitigate input latency of input threads Remove usage of base/string/* in libfs_avb Add getFdStateDebug to access Looper's callbacks libsnapshot: CHECK -> CHECK_EQ Mount /mnt/vm earlier Define linker.config.json as a filegroup Remove usage of base/logging.h in libfs_avb debuggerd: recognize jumps to non-executable memory. Support vendor partition in non-debuggable pVMs Remind the reader that they'll need to modify CTS too. Rename system/core/rootdir/Android.mk to create_root_structure.mk trusty: keymint/gatekeeper: Pass device name from init scripts Remove unused variable. ... Conflicts: fs_mgr/libsnapshot/include/libsnapshot/snapshot.h fs_mgr/libsnapshot/snapshot.cpp init/Android.bp init/fuzzer/Android.bp Change-Id: I29c07b3ac76940cb2b82726e98d2beb643b3e6e4
73 lines
1.7 KiB
Text
73 lines
1.7 KiB
Text
/*
|
|
* Copyright (C) 2022 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package {
|
|
default_applicable_licenses: ["system_core_init_license"],
|
|
}
|
|
|
|
cc_defaults {
|
|
name: "libinit_fuzzer_defaults",
|
|
static_libs: [
|
|
"liblmkd_utils",
|
|
"libmodprobe",
|
|
"libprotobuf-cpp-lite",
|
|
"libpropertyinfoparser",
|
|
"libsnapshot_init",
|
|
"libinit",
|
|
],
|
|
shared_libs: [
|
|
"libbase",
|
|
"libfs_mgr",
|
|
"libkeyutils",
|
|
"liblog",
|
|
"libprocessgroup",
|
|
"libselinux",
|
|
],
|
|
header_libs: ["libinit_headers"],
|
|
fuzz_config: {
|
|
cc: [
|
|
"android-media-fuzzing-reports@google.com",
|
|
],
|
|
componentid: 155276,
|
|
},
|
|
}
|
|
|
|
cc_fuzz {
|
|
name: "init_parser_fuzzer",
|
|
srcs: [
|
|
"init_parser_fuzzer.cpp",
|
|
],
|
|
defaults: [
|
|
"libinit_fuzzer_defaults",
|
|
],
|
|
}
|
|
|
|
cc_fuzz {
|
|
name: "init_property_fuzzer",
|
|
srcs: [
|
|
"init_property_fuzzer.cpp",
|
|
],
|
|
defaults: ["libinit_fuzzer_defaults"],
|
|
}
|
|
|
|
cc_fuzz {
|
|
name: "init_ueventHandler_fuzzer",
|
|
srcs: [
|
|
"init_ueventHandler_fuzzer.cpp",
|
|
],
|
|
defaults: [
|
|
"libinit_fuzzer_defaults",
|
|
],
|
|
}
|