tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Install runtime resource overlay without subdir.

Browse source 
am: a08a1015bc

Change-Id: I1ca2e029b79bf125145d2031a722914fe24dd299
This commit is contained in:
Jakub Adamek 2016-10-05 20:03:45 +00:00 committed by android-build-merger
commit 44dd3e2842
4 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/base_rules.mk
View file

@ -252,7 +252,10 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
# Apk and its attachments reside in its own subdir.
ifeq ($(LOCAL_MODULE_CLASS),APPS)
# framework-res.apk doesn't like the additional layer.
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
# Neither do Runtime Resource Overlay apks, which contain just the overlaid resources.
else ifeq ($(LOCAL_IS_RUNTIME_RESOURCE_OVERLAY),true)
else
my_module_path := $(my_module_path)/$(LOCAL_MODULE)
endif
endif

22
core/build_rro_package.mk Normal file
View file

@ -0,0 +1,22 @@
#########################################################################
## 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.
##
#########################################################################
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
ifneq ($(LOCAL_SRC_FILES),)
$(error runtime resource overlay package should not contain sources)
endif
ifeq (S(LOCAL_RRO_SKU),)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_SKU)
endif
include $(BUILD_SYSTEM)/package.mk

2
core/clear_vars.mk
View file

@ -378,6 +378,8 @@ LOCAL_INIT_RC_64:=
LOCAL_MODULE_SYMLINKS_32:=
LOCAL_MODULE_SYMLINKS_64:=
LOCAL_JAVA_LANGUAGE_VERSION:=
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=
LOCAL_RRO_SKU:=
LOCAL_IS_AUX_MODULE :=
LOCAL_AUX_TOOLCHAIN :=

1
core/config.mk
View file

@ -68,6 +68,7 @@ BUILD_EXECUTABLE:= $(BUILD_SYSTEM)/executable.mk
BUILD_HOST_EXECUTABLE:= $(BUILD_SYSTEM)/host_executable.mk
BUILD_PACKAGE:= $(BUILD_SYSTEM)/package.mk
BUILD_PHONY_PACKAGE:= $(BUILD_SYSTEM)/phony_package.mk
BUILD_RRO_PACKAGE:= $(BUILD_SYSTEM)/build_rro_package.mk
BUILD_HOST_PREBUILT:= $(BUILD_SYSTEM)/host_prebuilt.mk
BUILD_PREBUILT:= $(BUILD_SYSTEM)/prebuilt.mk
BUILD_MULTI_PREBUILT:= $(BUILD_SYSTEM)/multi_prebuilt.mk