Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shusky: Remove non-existent vendor includes

Browse source 
Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27
This commit is contained in:
Michael Bestas 2025-06-19 02:37:57 +03:00 • committed by Michael Bestas
parent 4809279a81
commit 455a966ad8
No known key found for this signature in database
4 changed files with 0 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

24
device-husky.mk
View file

@ -14,9 +14,6 @@
# limitations under the License. # 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 ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
endif endif
@ -41,14 +38,6 @@ ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
endif 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 # display
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
@ -285,9 +274,6 @@ PRODUCT_PACKAGES += \
WifiOverlay2023 \ WifiOverlay2023 \
PixelWifiOverlay2023 PixelWifiOverlay2023
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
# UWB # UWB
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
device/google/shusky/uwb device/google/shusky/uwb
@ -316,12 +302,6 @@ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=50p \ vendor.zram.size=50p \
persist.device_config.configuration.disable_rescue_party=true 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 += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.als_feed_forward_supported=true \
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
@ -473,10 +453,6 @@ PRODUCT_PACKAGES += \
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
ifneq ($(wildcard vendor/arm/mali/valhall),)
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
endif
# Bluetooth device id # Bluetooth device id
# Husky: 0x410D # Husky: 0x410D
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \

23
device-shiba.mk
View file

@ -14,9 +14,6 @@
# limitations under the License. # 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 ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
endif endif
@ -39,13 +36,6 @@ ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
endif 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 DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
CAMERA_PRODUCT ?= shiba CAMERA_PRODUCT ?= shiba
@ -276,9 +266,6 @@ PRODUCT_PACKAGES += \
WifiOverlay2023 \ WifiOverlay2023 \
PixelWifiOverlay2023 PixelWifiOverlay2023
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
# Location # Location
# SDK build system # SDK build system
include device/google/gs-common/gps/brcm/device.mk include device/google/gs-common/gps/brcm/device.mk
@ -303,12 +290,6 @@ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=50p \ vendor.zram.size=50p \
persist.device_config.configuration.disable_rescue_party=true 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 # Fingerprint exposure compensation
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.auto_exposure_compensation_supported=true persist.vendor.udfps.auto_exposure_compensation_supported=true
@ -445,10 +426,6 @@ PRODUCT_PACKAGES += \
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
ifneq ($(wildcard vendor/arm/mali/valhall),)
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
endif
# Bluetooth device id # Bluetooth device id
# Shiba: 0x410E # Shiba: 0x410E
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \

2
husky/BoardConfig.mk
View file

@ -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/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-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 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/sepolicy/husky-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk include device/google/shusky/wifi/BoardConfig-wifi.mk

2
shiba/BoardConfig.mk
View file

@ -40,9 +40,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/shusky/device-shusky-common.mk include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-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 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/sepolicy/shiba-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk include device/google/shusky/wifi/BoardConfig-wifi.mk