Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5109c8ce authored by Yifan Hong's avatar Yifan Hong
Browse files

charger: Move built-in resources to /system 

Convert rules to build charger resources to Soong
assuming BOARD_CHARGER_NO_UI is not set. As of now,
no devices in the source tree sets this variable. Also,
these images should be installed to the system image
regardless of this variable.

This change moves battery_fail and battery_scale to
/system/etc/res/images/charger.

Test: build and inspect system/etc/res/images/charger
Fixes: 143907179
Change-Id: Idccf5631371c7520cbfcfa6e92d1e88d0f3f95e7
parent abda7153

healthd/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -257,3 +257,27 @@ cc_test { 
        "device-tests",

    ],

}



// /system/etc/res/images/charger/battery_fail.png

prebuilt_etc {

    name: "system_core_charger_res_images_battery_fail.png",

    src: "images/battery_fail.png",

    relative_install_path: "res/images/charger",

    filename: "battery_fail.png",

}



// /system/etc/res/images/charger/battery_scale.png

prebuilt_etc {

    name: "system_core_charger_res_images_battery_scale.png",

    src: "images/battery_scale.png",

    relative_install_path: "res/images/charger",

    filename: "battery_scale.png",

}



phony {

    name: "charger_res_images",

    required: [

        "system_core_charger_res_images_battery_fail.png",

        "system_core_charger_res_images_battery_scale.png",

    ],

}

healthd/Android.mk

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
# Copyright 2013 The Android Open Source Project



LOCAL_PATH := $(call my-dir)



ifeq ($(strip $(BOARD_CHARGER_NO_UI)),true)

LOCAL_CHARGER_NO_UI := true

endif



### charger_res_images ###

ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)

define _add-charger-image

include $$(CLEAR_VARS)

LOCAL_MODULE := system_core_charger_res_images_$(notdir $(1))

LOCAL_MODULE_STEM := $(notdir $(1))

_img_modules += $$(LOCAL_MODULE)

LOCAL_SRC_FILES := $1

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $$(TARGET_ROOT_OUT)/res/images/charger

include $$(BUILD_PREBUILT)

endef



_img_modules :=

_images :=

$(foreach _img, $(call find-subdir-subdir-files, "images", "*.png"), \

  $(eval $(call _add-charger-image,$(_img))))



include $(CLEAR_VARS)

LOCAL_MODULE := charger_res_images

LOCAL_MODULE_TAGS := optional

LOCAL_REQUIRED_MODULES := $(_img_modules)

include $(BUILD_PHONY_PACKAGE)



_add-charger-image :=

_img_modules :=

endif # LOCAL_CHARGER_NO_UI