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

Commit cdb14991 authored by Flavio Lerda's avatar Flavio Lerda Committed by Android (Google) Code Review
Browse files

Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev

parents c81ebc10 3451f245

core/build_rro_package.mk

+9 −6
Original line number Diff line number Diff line 
#########################################################################

#############################################################################

## Standard rules for installing runtime resouce overlay APKs.

##

## Set LOCAL_RRO_SKU to the SKU name if the package should apply only to

## a particular SKU as set by ro.boot.vendor.overlay.sku system property.

## Set LOCAL_RRO_THEME to the theme name if the package should apply only to

## a particular theme as set by ro.boot.vendor.overlay.theme system property.

##

#########################################################################

## If LOCAL_RRO_THEME is not set, the package will apply always, independent

## of themes.

##

#############################################################################



LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
@@ -12,10 +15,10 @@ ifneq ($(LOCAL_SRC_FILES),) 
  $(error runtime resource overlay package should not contain sources)

endif



ifeq (S(LOCAL_RRO_SKU),)

ifeq (S(LOCAL_RRO_THEME),)

  LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay

else

  LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_SKU)

  LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_THEME)

endif



include $(BUILD_SYSTEM)/package.mk

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ LOCAL_INIT_RC_32:= 
LOCAL_INIT_RC_64:=

LOCAL_JAVA_LANGUAGE_VERSION:=

LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=

LOCAL_RRO_SKU:=

LOCAL_RRO_THEME:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.