diff options
Diffstat (limited to 'device-bluejay.mk')
| -rw-r--r-- | device-bluejay.mk | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/device-bluejay.mk b/device-bluejay.mk index 83b8f23..da89a1e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/bluejay-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers @@ -24,23 +27,31 @@ $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/devi $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/bluejay/device-vendor-bluejay.mk) $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/WallpapersBluejay.mk) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay include device/google/gs101/fingerprint/extension/fingerprint.extension.mk include device/google/bluejay-sepolicy/bluejay-sepolicy.mk include device/google/bluejay/audio/bluejay/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2 else -include device/google/gs101/fingerprint/udfps_factory.mk +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk +endif +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) +else +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # go/lyric-soong-variables @@ -124,7 +135,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=52 + ro.vendor.build.svn=54 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -133,6 +144,13 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk +endif # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 @@ -148,13 +166,13 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach # Bluetooth Tx power caps for bluejay PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB17L_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GX7AS_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB62Z_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GX7AS_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GX7AS_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_G1AZG_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G1AZG_EU.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB62Z_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_EU.csv + device/google/bluejay/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/bluejay/bluetooth_power_limits_GB17L_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/bluejay/bluetooth_power_limits_GX7AS_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \ + device/google/bluejay/bluetooth_power_limits_GB62Z_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_US.csv \ + device/google/bluejay/bluetooth_power_limits_GX7AS_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GX7AS_US.csv \ + device/google/bluejay/bluetooth_power_limits_G1AZG_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G1AZG_EU.csv \ + device/google/bluejay/bluetooth_power_limits_GB62Z_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_EU.csv # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ |