walleye: Convert to full walleye tree

Signed-off-by: Asriadi Rahim <asriadirahim03@gmail.com>
This commit is contained in:
Asriadi
2023-04-20 21:19:58 +08:00
committed by Asriadi Rahim
parent 6680250e42
commit 52b643ea2a
10 changed files with 20 additions and 21 deletions

View File

@@ -14,4 +14,4 @@
# limitations under the License.
#
-include vendor/google_devices/muskie/proprietary/AndroidBoardVendor.mk
-include vendor/google_devices/walleye/proprietary/AndroidBoardVendor.mk

View File

@@ -18,12 +18,12 @@ TARGET_BOOTLOADER_BOARD_NAME := walleye
DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056
include device/google/wahoo/BoardConfig.mk
-include vendor/google_devices/muskie/proprietary/BoardConfigVendor.mk
-include vendor/google_devices/walleye/proprietary/BoardConfigVendor.mk
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
#sepolicy common to muskie/walleye
BOARD_VENDOR_SEPOLICY_DIRS += device/google/muskie/sepolicy
#sepolicy common to walleye
BOARD_VENDOR_SEPOLICY_DIRS += device/google/walleye/sepolicy
# Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/wahoo-setup.sh

View File

@@ -47,7 +47,6 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/muskie/vendor/etc/sensors/sensor_def_qcomdev.conf)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/walleye/vendor/etc/sensors/sensor_def_qcomdev.conf)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.$(PRODUCT_HARDWARE).logging.rc)

View File

@@ -19,14 +19,14 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, device/google/muskie/device-walleye.mk)
$(call inherit-product-if-exists, vendor/google_devices/muskie/proprietary/device-vendor-walleye.mk)
$(call inherit-product, device/google/walleye/device-walleye.mk)
$(call inherit-product-if-exists, vendor/google_devices/walleye/proprietary/device-vendor-walleye.mk)
PRODUCT_PACKAGES += \
vndk_package
PRODUCT_COPY_FILES += \
device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
device/google/walleye/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
PRODUCT_RESTRICT_VENDOR_FILES := owner

View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product, device/google/muskie/aosp_walleye.mk)
$(call inherit-product, device/google/walleye/aosp_walleye.mk)
PRODUCT_NAME := aosp_walleye_hwasan
# Add "hwaddress" as a global sanitizer if it's missing.

View File

@@ -14,6 +14,6 @@
# limitations under the License.
#
$(call inherit-product, device/google/muskie/aosp_walleye.mk)
$(call inherit-product, device/google/walleye/aosp_walleye.mk)
PRODUCT_NAME := aosp_walleye_test

View File

@@ -1 +1 @@
require board=muskie|walleye
require board=walleye

View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
LOCAL_PATH := device/google/muskie
LOCAL_PATH := device/google/walleye
# Audio XMLs
PRODUCT_COPY_FILES += \
@@ -79,14 +79,14 @@ PRODUCT_COPY_FILES += \
include device/google/wahoo/device.mk
PRODUCT_COPY_FILES += \
device/google/muskie/nfc/libnfc-nxp.muskie.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
device/google/walleye/nfc/libnfc-nxp.walleye.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
PRODUCT_COPY_FILES += \
device/google/muskie/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \
device/google/muskie/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf
device/google/walleye/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \
device/google/walleye/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf
PRODUCT_COPY_FILES += \
device/google/muskie/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
device/google/walleye/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
# Shims
PRODUCT_PACKAGES += \
@@ -94,7 +94,7 @@ PRODUCT_PACKAGES += \
# Wifi configuration file
PRODUCT_COPY_FILES += \
device/google/muskie/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
device/google/walleye/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
#IMU calibration
PRODUCT_PROPERTY_OVERRIDES += \

View File

@@ -21,7 +21,7 @@ PRODUCT_AAPT_PREBUILT_DPI := xxhdpi xhdpi hdpi
PRODUCT_HARDWARE := walleye
# To build walleye specific modules e.g. librecovery_ui_walleye.
PRODUCT_SOONG_NAMESPACES += device/google/muskie
PRODUCT_SOONG_NAMESPACES += device/google/walleye
# DEVICE_PACKAGE_OVERLAYS for the device should be before
# including common overlays since the one listed first
@@ -29,13 +29,13 @@ PRODUCT_SOONG_NAMESPACES += device/google/muskie
ifdef DEVICE_PACKAGE_OVERLAYS
$(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PRODUCT_HARDWARE)' overlays)
endif
DEVICE_PACKAGE_OVERLAYS += device/google/muskie/walleye/overlay
DEVICE_PACKAGE_OVERLAYS += device/google/walleye/overlay
include device/google/muskie/device-common.mk
include device/google/walleye/device-common.mk
PRODUCT_PROPERTY_OVERRIDES += \
ro.sf.lcd_density=420
# Thermal HAL
PRODUCT_COPY_FILES += \
device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
device/google/walleye/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json