Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/device/google/gs-common into HEAD
Android 15.0.0 Release 6 (AP4A.241205.013)
Change-Id: I52127945f7739d2fc4341dcb74f3a221ce66fc67
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec=
# =JvPS
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 05 Dec 2024 11:44:01 PM CET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key
diff --git a/aoc/aoc.mk b/aoc/aoc.mk
index 136bb42..1d2ba55 100644
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -11,13 +11,8 @@
endif
# 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
# AoC debug support
PRODUCT_PACKAGES_DEBUG += \