Merge "Add RRO partition specification in Makefiles" am: 6983776cdb

am: e04a4b983e

Change-Id: I0db700da17756d2bbb8562bdf531fc992ca5d335
This commit is contained in:
Anton Hansson 2018-12-05 07:14:24 -08:00 committed by android-build-merger
commit d5bdad5ee9

View file

@ -15,11 +15,23 @@ ifneq ($(LOCAL_SRC_FILES),)
$(error runtime resource overlay package should not contain sources)
endif
ifeq ($(LOCAL_RRO_THEME),)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay
partition :=
ifeq ($(LOCAL_ODM_MODULE),true)
partition := $(TARGET_OUT_ODM)
else ifeq ($(LOCAL_PRODUCT_MODULE),true)
partition := $(TARGET_OUT_PRODUCT)
else ifeq ($(LOCAL_PRODUCT_SERVICES_MODULE),true)
partition := $(TARGET_OUT_PRODUCT_SERVICES)
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_THEME)
partition := $(TARGET_OUT_VENDOR)
endif
include $(BUILD_SYSTEM)/package.mk
ifeq ($(LOCAL_RRO_THEME),)
LOCAL_MODULE_PATH := $(partition)/overlay
else
LOCAL_MODULE_PATH := $(partition)/overlay/$(LOCAL_RRO_THEME)
endif
partition :=
include $(BUILD_SYSTEM)/package.mk