p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change name of overlay subdir 'sku'->'theme' 

The name 'sku' does not fit well as we recommend to use the same
value for different SKUs if vendors wish to have the same colors
on those SKUs.

Bug: 32268656
Change-Id: Ibb29279343058724808e27ddf2be0d0da36b1312
This commit is contained in:
Jakub Adamek 2016-10-19 11:42:51 +01:00 committed by Jakub Adámek
parent 3dc35a0148
commit 3451f2454a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/build_rro_package.mk
View File

@ -1,10 +1,13 @@
#########################################################################
#############################################################################
## 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

2
core/clear_vars.mk
View File

@ -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.