From 52b643ea2a632c65a7bba9b82e2c9ce0bdd79bb3 Mon Sep 17 00:00:00 2001 From: Asriadi Date: Thu, 20 Apr 2023 21:19:58 +0800 Subject: [PATCH] walleye: Convert to full walleye tree Signed-off-by: Asriadi Rahim --- AndroidBoard.mk | 2 +- BoardConfig.mk | 6 +++--- CleanSpec.mk | 1 - aosp_walleye.mk | 6 +++--- aosp_walleye_hwasan.mk | 2 +- aosp_walleye_test.mk | 2 +- board-info.txt | 2 +- device-common.mk | 12 ++++++------ device-walleye.mk | 8 ++++---- ...ibnfc-nxp.muskie.conf => libnfc-nxp.walleye.conf} | 0 10 files changed, 20 insertions(+), 21 deletions(-) rename nfc/{libnfc-nxp.muskie.conf => libnfc-nxp.walleye.conf} (100%) diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 6ec4ce4..336a58b 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -14,4 +14,4 @@ # limitations under the License. # --include vendor/google_devices/muskie/proprietary/AndroidBoardVendor.mk +-include vendor/google_devices/walleye/proprietary/AndroidBoardVendor.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 7d3b2a0..9be8b42 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -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 diff --git a/CleanSpec.mk b/CleanSpec.mk index 5da2ea8..4a96dc2 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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) diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 533f647..5f4c625 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.mk @@ -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 diff --git a/aosp_walleye_hwasan.mk b/aosp_walleye_hwasan.mk index 948b8da..81afa64 100644 --- a/aosp_walleye_hwasan.mk +++ b/aosp_walleye_hwasan.mk @@ -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. diff --git a/aosp_walleye_test.mk b/aosp_walleye_test.mk index 64d1728..fcfd840 100644 --- a/aosp_walleye_test.mk +++ b/aosp_walleye_test.mk @@ -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 diff --git a/board-info.txt b/board-info.txt index a017da8..1579193 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1 +1 @@ -require board=muskie|walleye +require board=walleye diff --git a/device-common.mk b/device-common.mk index 5ec8de1..ebd637b 100644 --- a/device-common.mk +++ b/device-common.mk @@ -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 += \ diff --git a/device-walleye.mk b/device-walleye.mk index 36a5483..b47d1f1 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -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 diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.walleye.conf similarity index 100% rename from nfc/libnfc-nxp.muskie.conf rename to nfc/libnfc-nxp.walleye.conf