commit 64f7b41a0176c1de178caf21a858f5efe44f21aa
author Marko Man <darkobas@gmail.com> Fri Sep 20 12:31:23 2019 +0200
committer Max Weninger <max.weninger@gmail.com> Sat Sep 28 17:33:26 2019 +0200
tree 5a97ace6b83c73a75a149aae3424b13f074ad6be
parent ab2ffd2d2fe5cf93b1084a5b36a14172bc22c2ba

vendor: charger: change charger res location

move to product, product comes first

Change-Id: I6c29a2e477f440ff78e8eead85466a76305a4cf5

charger/Android.mk

diff --git a/charger/Android.mk b/charger/Android.mk
index fb9eeff..413e68e 100644
--- a/charger/Android.mk
+++ b/charger/Android.mk
@@ -13,7 +13,8 @@
 LOCAL_SRC_FILES := fonts/$(charger_density)/font_charger.png
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/res/images
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := res/images
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -21,10 +22,11 @@
 LOCAL_SRC_FILES := anim/animation.txt
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/res/values/charger
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := res/values/charger
 include $(BUILD_PREBUILT)
 
-define _add-charger-image
+define _add-omni-charger-image
 include $$(CLEAR_VARS)
 LOCAL_MODULE := omni_core_charger_$(notdir $(1))
 LOCAL_MODULE_STEM := $(notdir $(1))
@@ -32,18 +34,20 @@
 LOCAL_SRC_FILES := $1
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_ROOT_OUT)/res/images/charger
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := res/images/charger
 include $$(BUILD_PREBUILT)
 endef
 
 _img_modules :=
 _images :=
 $(foreach _img, $(call find-subdir-subdir-files, "images/$(charger_density)", "*.png"), \
-  $(eval $(call _add-charger-image,$(_img))))
+  $(eval $(call _add-omni-charger-image,$(_img))))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := omni_charger_res_images
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := omni
 LOCAL_REQUIRED_MODULES := $(_img_modules)
 include $(BUILD_PHONY_PACKAGE)