diff --git a/device-husky.mk b/device-husky.mk index e9d705e..65bc45f 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -14,9 +14,6 @@ # 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) - ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) endif @@ -41,14 +38,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) endif -$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk) -$(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) -$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk) - # display DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true @@ -285,9 +274,6 @@ PRODUCT_PACKAGES += \ WifiOverlay2023 \ PixelWifiOverlay2023 -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts - # UWB PRODUCT_SOONG_NAMESPACES += \ device/google/shusky/uwb @@ -316,12 +302,6 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=50p \ persist.device_config.configuration.disable_rescue_party=true -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true @@ -473,10 +453,6 @@ PRODUCT_PACKAGES += \ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -ifneq ($(wildcard vendor/arm/mali/valhall),) -PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true -endif - # Bluetooth device id # Husky: 0x410D PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index f087e57..c5d5870 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -14,9 +14,6 @@ # 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) - ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) endif @@ -39,13 +36,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) endif -$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/shiba/device-vendor-shiba.mk) -$(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk) - DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay CAMERA_PRODUCT ?= shiba @@ -276,9 +266,6 @@ PRODUCT_PACKAGES += \ WifiOverlay2023 \ PixelWifiOverlay2023 -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts - # Location # SDK build system include device/google/gs-common/gps/brcm/device.mk @@ -303,12 +290,6 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=50p \ persist.device_config.configuration.disable_rescue_party=true -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - # Fingerprint exposure compensation PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.auto_exposure_compensation_supported=true @@ -445,10 +426,6 @@ PRODUCT_PACKAGES += \ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -ifneq ($(wildcard vendor/arm/mali/valhall),) -PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true -endif - # Bluetooth device id # Shiba: 0x410E PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 0096a19..709134b 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -44,9 +44,7 @@ $(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk --include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky/sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 3850636..4643c26 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -40,9 +40,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk --include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky/sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk