summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-08 13:13:48 -0800
committerXin Li <delphij@google.com>2023-12-08 13:13:48 -0800
commit61a7265d39bf11f9191e5bc0ca1e5c8e31407a88 (patch)
tree275d6e3aaf06731fb11c55e02e572f624611d618
parentc67c23d7efe19aa40b550dde4399f3a6ebfb3ce7 (diff)
parent4f9c0920e553f39fe7d209d323f1a75eb82ca6d1 (diff)
downloadsunfish-61a7265d39bf11f9191e5bc0ca1e5c8e31407a88.tar.gz
Merge Android 14 QPR1
Merged-In: I405116d274cfcba81fa0be1aa330b13bd1bef64d Bug: 315507370 Change-Id: Ie13b9ee1ce67642bf088961f0b0e5367d21e39c5
-rw-r--r--device.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 64d93e82..97b6114b 100644
--- a/device.mk
+++ b/device.mk
@@ -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