From 6b64e22c7956d70e83178c5029536583b92417cf Mon Sep 17 00:00:00 2001 From: Asriadi Rahim Date: Tue, 2 Jan 2024 19:56:49 +0000 Subject: [PATCH] walleye: Clean up device tree Signed-off-by: Asriadi Rahim --- device-walleye.mk | 41 ---------------------------- device-common.mk => device.mk | 50 +++++++++++++++++++++++++---------- lineage_walleye.mk | 2 +- 3 files changed, 37 insertions(+), 56 deletions(-) delete mode 100644 device-walleye.mk rename device-common.mk => device.mk (67%) diff --git a/device-walleye.mk b/device-walleye.mk deleted file mode 100644 index b47d1f1..0000000 --- a/device-walleye.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -PRODUCT_AAPT_CONFIG := normal -PRODUCT_AAPT_PREF_CONFIG := xxhdpi -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/walleye - -# DEVICE_PACKAGE_OVERLAYS for the device should be before -# including common overlays since the one listed first -# takes precedence. -ifdef DEVICE_PACKAGE_OVERLAYS -$(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PRODUCT_HARDWARE)' overlays) -endif -DEVICE_PACKAGE_OVERLAYS += device/google/walleye/overlay - -include device/google/walleye/device-common.mk - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.sf.lcd_density=420 - -# Thermal HAL -PRODUCT_COPY_FILES += \ - device/google/walleye/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json diff --git a/device-common.mk b/device.mk similarity index 67% rename from device-common.mk rename to device.mk index a70d406..742c5b7 100644 --- a/device-common.mk +++ b/device.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 The Android Open-Source Project +# Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,13 +14,33 @@ # limitations under the License. # -LOCAL_PATH := device/google/walleye +PRODUCT_AAPT_CONFIG := normal +PRODUCT_AAPT_PREF_CONFIG := xxhdpi +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/walleye + +# DEVICE_PACKAGE_OVERLAYS for the device should be before +# including common overlays since the one listed first +# takes precedence. +ifdef DEVICE_PACKAGE_OVERLAYS +$(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PRODUCT_HARDWARE)' overlays) +endif +DEVICE_PACKAGE_OVERLAYS += device/google/walleye/overlay # Audio XMLs PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \ - $(LOCAL_PATH)/audio_platform_info_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tavil.xml \ - $(LOCAL_PATH)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/walleye/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \ + device/google/walleye/audio_platform_info_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tavil.xml \ + device/google/walleye/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + +include device/google/wahoo/device.mk + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.sf.lcd_density=420 # Bug 62375603 PRODUCT_PROPERTY_OVERRIDES += audio.adm.buffering.ms=3 @@ -60,23 +80,21 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.radio.log_loc="/data/vendor/modem_dump" PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/init.logging.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc + device/google/walleye/init.logging.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc else PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/init.logging.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc + device/google/walleye/init.logging.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).logging.rc endif PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/init-common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \ - $(LOCAL_PATH)/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).usb.rc \ - $(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \ - $(LOCAL_PATH)/init.insmod_charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod_charger.cfg + device/google/walleye/init-common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \ + device/google/walleye/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).usb.rc \ + device/google/walleye/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \ + device/google/walleye/init.insmod_charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod_charger.cfg # Input device files PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/synaptics_dsxv26.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/synaptics_dsxv26.idc - -include device/google/wahoo/device.mk + device/google/walleye/synaptics_dsxv26.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/synaptics_dsxv26.idc PRODUCT_COPY_FILES += \ device/google/walleye/nfc/libnfc-nxp.walleye.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf @@ -104,6 +122,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.camera.notify_nfc=1 +# Thermal HAL +PRODUCT_COPY_FILES += \ + device/google/walleye/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + # VNDK PRODUCT_COPY_FILES += \ prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libhidlbase-v32.so \ diff --git a/lineage_walleye.mk b/lineage_walleye.mk index 9abd4ba..ee0ac6b 100644 --- a/lineage_walleye.mk +++ b/lineage_walleye.mk @@ -36,7 +36,7 @@ TARGET_SCREEN_HEIGHT := 1920 TARGET_SCREEN_WIDTH := 1080 # Inherit device configuration -$(call inherit-product, device/google/walleye/device-walleye.mk) +$(call inherit-product, device/google/walleye/device.mk) $(call inherit-product, vendor/google/walleye/walleye-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/walleye/proprietary/device-vendor-walleye.mk)