Merge Android 14 QPR1

Merged-In: I405116d274cfcba81fa0be1aa330b13bd1bef64d
Bug: 315507370
Change-Id: Ie13b9ee1ce67642bf088961f0b0e5367d21e39c5
This commit is contained in:
Xin Li
2023-12-08 13:13:48 -08:00

View File

@@ -887,7 +887,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER)
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.build.svn=64
ro.vendor.build.svn=65
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
@@ -910,6 +910,9 @@ endif
# Project
include hardware/google/pixel/common/pixel-common-device.mk
# gs-common
include device/google/gs-common/misc_writer/misc_writer.mk
# Citadel
include hardware/google/pixel/citadel/citadel.mk