diff --git a/device-oriole.mk b/device-oriole.mk index 1bcf787..7e4fdca 100644 --- a/device-oriole.mk +++ b/device-oriole.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_ORIOLE_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) endif @@ -30,14 +27,6 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers -$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/oriole/device-vendor-oriole.mk) -$(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk) - DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk @@ -46,11 +35,6 @@ include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g6_trusty -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,oriole) $(call soong_config_set,lyric,tuning_product,oriole) @@ -248,9 +232,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 \ ro.gms.dck.se_capability=1 -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts - # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -322,8 +303,3 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Oriole: 0x4106 PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=16646 - -# PlayVideos -PLAYVIDEOS_VERSION_DIR := 4.20.6 -$(call soong_config_set_bool,playvideos,use_device_specific_version,true) -PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) diff --git a/device-raven.mk b/device-raven.mk index 52ebf80..6233d65 100644 --- a/device-raven.mk +++ b/device-raven.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_RAVEN_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) endif @@ -31,13 +28,6 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) -$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-raven.mk) -$(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersRaven.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay @@ -47,11 +37,6 @@ include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g6_trusty -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - include device/google/raviole/uwb/uwb_calibration.mk # go/lyric-soong-variables @@ -253,9 +238,6 @@ PRODUCT_PACKAGES += \ SettingsOverlayGLU0G \ SettingsOverlayG8V0U -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts - # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -329,8 +311,3 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Raven: 0x4107 PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=16647 - -# PlayVideos -PLAYVIDEOS_VERSION_DIR := 4.20.6 -$(call soong_config_set_bool,playvideos,use_device_specific_version,true) -PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 4653004..b984e91 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -41,9 +41,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk --include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/oriole diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 5bb96ee..81ddf82 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -41,9 +41,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk --include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/raven diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index f6dc7c7..f1cb62f 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,6 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/raviole/uwb