From 062ebe531367460f18424b8175c1f16dbcf8ba7c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 19 Apr 2023 22:26:16 -0700 Subject: [PATCH] Add AOSP support for Husky and Shiba. We will have a 'vendor' project containing proprietary blobs to be able to build and flash Pixel device when vendor source is not available. The project names are platform/vendor/aosp/google_devices/husky platform/vendor/aosp/google_devices/shiba and the paths are vendor/google_devices/husky vendor/google_devices/shiba TEST:make and flash a husky device BUG: 278968179 Change-Id: I1c5424dfddddb8ee29a86f2408a231aa5556a0bb --- device-husky.mk | 1 + device-shiba.mk | 1 + husky/BoardConfig.mk | 1 + shiba/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 12788bd..6eab779 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -25,6 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device- $(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) # display diff --git a/device-shiba.mk b/device-shiba.mk index 84a7cd9..ace099a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -21,6 +21,7 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device- $(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) DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index ef96816..205ca79 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -24,5 +24,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.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 197c691..2acc2a4 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -24,5 +24,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.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