summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-06-13 10:48:04 -0700
committerXin Li <delphij@google.com>2024-06-13 10:48:04 -0700
commit990452de8243d8ae34ceec57ebbd48ad6437e7fc (patch)
treeee2a6ca6f8e42b9ddc22be20c185d7d41342e563
parent9f219cff94d3074c3a5e00fb05ba8ff01e0fde97 (diff)
parentacb82f65e63527231384fb0aba4f1a826ba053d0 (diff)
downloadbarbet-master.tar.gz
Merge Android 14 QPR3 to AOSP mainHEADmastermain
Bug: 346855327 Merged-In: I3c0a334d7b9ea7f69adc58c1843fb49be67b749a Change-Id: Ief9b0746889aa7774089f7febc29244fd0c50ca1
-rw-r--r--device-barbet.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/device-barbet.mk b/device-barbet.mk
index 5a426d7..8382580 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -38,7 +38,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_ven
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=52
+ ro.vendor.build.svn=60
# Enable watchdog timeout loop breaker.
PRODUCT_PROPERTY_OVERRIDES += \
@@ -224,3 +224,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
NfcOverlayBarbet
+
+# Gyotaku
+include device/google/gs-common/gyotaku_app/gyotaku.mk