From af993abe8e4d99ea333bae296319d239ecbe81fd Mon Sep 17 00:00:00 2001 From: Joey Huab Date: Fri, 5 Sep 2025 21:42:36 +0900 Subject: [PATCH] Revert "charger: Convert to Android.bp" This reverts commit b3e6f3ad7e55a9954a8e3be6077c041d2d036bbe. --- charger/Android.bp | 85 ------------------------------ charger/Android.mk | 104 +++++++++++++++++++++++++++++++++++++ config/BoardConfigSoong.mk | 14 ----- 3 files changed, 104 insertions(+), 99 deletions(-) delete mode 100644 charger/Android.bp create mode 100644 charger/Android.mk diff --git a/charger/Android.bp b/charger/Android.bp deleted file mode 100644 index 6da0fa02..00000000 --- a/charger/Android.bp +++ /dev/null @@ -1,85 +0,0 @@ -// -// SPDX-FileCopyrightText: The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -lineage_charger_density = select(soong_config_variable("lineage_charger", "density"), { - any @ flag_val: flag_val, - default: "mdpi", -}) - -prebuilt_etc { - name: "lineage_charger_battery_scale", - filename: "battery_scale.png", - src: lineage_charger_density + "/battery_scale.png", - relative_install_path: "res/images/charger", - product_specific: true, -} - -prebuilt_etc { - name: "lineage_charger_battery_scale_vendor", - filename: "battery_scale.png", - src: lineage_charger_density + "/battery_scale.png", - relative_install_path: "res/images/charger", - proprietary: true, -} - -prebuilt_etc { - name: "lineage_charger_battery_fail", - filename: "battery_fail.png", - src: lineage_charger_density + "/battery_fail.png", - relative_install_path: "res/images/charger", - product_specific: true, -} - -prebuilt_etc { - name: "lineage_charger_battery_fail_vendor", - filename: "battery_fail.png", - src: lineage_charger_density + "/battery_fail.png", - relative_install_path: "res/images/charger", - proprietary: true, -} - -prebuilt_etc { - name: "lineage_charger_font", - filename: "percent_font.png", - src: lineage_charger_density + "/percent_font.png", - relative_install_path: "res/images/charger", - product_specific: true, -} - -prebuilt_etc { - name: "lineage_charger_font_vendor", - filename: "percent_font.png", - src: lineage_charger_density + "/percent_font.png", - relative_install_path: "res/images/charger", - proprietary: true, -} - -prebuilt_etc { - name: "lineage_charger_animation", - filename: "animation.txt", - - required: [ - "lineage_charger_battery_fail", - "lineage_charger_battery_scale", - "lineage_charger_font", - ], - src: "animation.txt", - relative_install_path: "res/values/charger", - product_specific: true, -} - -prebuilt_etc { - name: "lineage_charger_animation_vendor", - filename: "animation.txt", - - required: [ - "lineage_charger_battery_fail_vendor", - "lineage_charger_battery_scale_vendor", - "lineage_charger_font_vendor", - ], - src: "animation.txt", - relative_install_path: "res/values/charger", - proprietary: true, -} diff --git a/charger/Android.mk b/charger/Android.mk new file mode 100644 index 00000000..6843d5a4 --- /dev/null +++ b/charger/Android.mk @@ -0,0 +1,104 @@ +# +# Copyright (C) 2021 The LineageOS 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. +# + +LOCAL_PATH := $(call my-dir) + +# Set lineage_charger_density to the density bucket of the device. +lineage_charger_density := mdpi +ifneq (,$(TARGET_SCREEN_DENSITY)) +lineage_charger_density := $(strip \ + $(or $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 560))),1),xxxhdpi),\ + $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 400))),1),xxhdpi),\ + $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 280))),1),xhdpi),\ + $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 200))),1),hdpi,mdpi))) +else ifneq (,$(filter mdpi hdpi xhdpi xxhdpi xxxhdpi,$(PRODUCT_AAPT_PREF_CONFIG))) +# If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value. +lineage_charger_density := $(PRODUCT_AAPT_PREF_CONFIG) +endif + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_battery_scale +LOCAL_MODULE_STEM := battery_scale.png +LOCAL_SRC_FILES := $(lineage_charger_density)/battery_scale.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_battery_scale_vendor +LOCAL_MODULE_STEM := battery_scale.png +LOCAL_SRC_FILES := $(lineage_charger_density)/battery_scale.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_battery_fail +LOCAL_MODULE_STEM := battery_fail.png +LOCAL_SRC_FILES := $(lineage_charger_density)/battery_fail.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_battery_fail_vendor +LOCAL_MODULE_STEM := battery_fail.png +LOCAL_SRC_FILES := $(lineage_charger_density)/battery_fail.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_font +LOCAL_MODULE_STEM := percent_font.png +LOCAL_SRC_FILES := $(lineage_charger_density)/percent_font.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_font_vendor +LOCAL_MODULE_STEM := percent_font.png +LOCAL_SRC_FILES := $(lineage_charger_density)/percent_font.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_animation +LOCAL_MODULE_STEM := animation.txt +LOCAL_SRC_FILES := animation.txt +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/values/charger +LOCAL_REQUIRED_MODULES := lineage_charger_battery_scale lineage_charger_battery_fail lineage_charger_font +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := lineage_charger_animation_vendor +LOCAL_MODULE_STEM := animation.txt +LOCAL_SRC_FILES := animation.txt +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/values/charger +LOCAL_REQUIRED_MODULES := lineage_charger_battery_scale_vendor lineage_charger_battery_fail_vendor lineage_charger_font_vendor +include $(BUILD_PREBUILT) diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index cd65d4b2..c24905f5 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -36,20 +36,6 @@ ifneq ($(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED),) $(error TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED is deprecated, please migrate to soong_config_set,camera,override_format_from_reserved) endif -# Charger -lineage_charger_density := mdpi -ifneq (,$(TARGET_SCREEN_DENSITY)) -lineage_charger_density := $(strip \ - $(or $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 560))),1),xxxhdpi),\ - $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 400))),1),xxhdpi),\ - $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 280))),1),xhdpi),\ - $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 200))),1),hdpi,mdpi))) -else ifneq (,$(filter mdpi hdpi xhdpi xxhdpi xxxhdpi,$(PRODUCT_AAPT_PREF_CONFIG))) -# If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value. -lineage_charger_density := $(PRODUCT_AAPT_PREF_CONFIG) -endif -$(call soong_config_set,lineage_charger,density,$(lineage_charger_density)) - # Libui ifneq ($(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS),) $(call soong_config_set,libui,additional_gralloc_10_usage_bits,$(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))