Merge tag 'android-15.0.0_r32' of https://android.googlesource.com/device/google/gs-common into HEAD
Android 15.0.0 Release 32 (BP1A.250505.005)
Change-Id: I36475607c6790437fe64d4f8fc5d9c1617db8b8b
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaBqG7QAKCRDorT+BmrEO
# eBHJAJ4wGjD6YpP5OcfouTMjTznK0tSB7gCfQyKSKRIUW5pPxk1kC9xg1Ml0bMU=
# =haho
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mar 06 mai 2025 18:02:21 EDT
# gpg: avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
diff --git a/aoc/aoc.mk b/aoc/aoc.mk
index 13d849c..085f61a 100644
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -5,13 +5,8 @@
aocxd
# If AoC Daemon is not present on this build, load firmware at boot via rc
-ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
-PRODUCT_COPY_FILES += \
- device/google/gs-common/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-else
PRODUCT_COPY_FILES += \
device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-endif
ifneq ($(wildcard vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml),)
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \