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

Merge "Install runtime resource overlay without subdir." into cw-f-dev

This commit is contained in:
Jakub Adámek 2016-10-05 19:57:22 +00:00 committed by Android (Google) Code Review
parent 73cead3e89 a08a1015bc
commit 84973f87e6
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

@ -210,7 +210,10 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
# Apk and its attachments reside in its own subdir. # Apk and its attachments reside in its own subdir.
ifeq ($(LOCAL_MODULE_CLASS),APPS) ifeq ($(LOCAL_MODULE_CLASS),APPS)
# framework-res.apk doesn't like the additional layer. # 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) my_module_path := $(my_module_path)/$(LOCAL_MODULE)
endif endif
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

@ -363,6 +363,8 @@ LOCAL_CLANG_64:=
LOCAL_INIT_RC_32:= LOCAL_INIT_RC_32:=
LOCAL_INIT_RC_64:= LOCAL_INIT_RC_64:=
LOCAL_JAVA_LANGUAGE_VERSION:= LOCAL_JAVA_LANGUAGE_VERSION:=
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=
LOCAL_RRO_SKU:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

1
core/config.mk
View File

@ -85,6 +85,7 @@ BUILD_EXECUTABLE:= $(BUILD_SYSTEM)/executable.mk
BUILD_HOST_EXECUTABLE:= $(BUILD_SYSTEM)/host_executable.mk BUILD_HOST_EXECUTABLE:= $(BUILD_SYSTEM)/host_executable.mk
BUILD_PACKAGE:= $(BUILD_SYSTEM)/package.mk BUILD_PACKAGE:= $(BUILD_SYSTEM)/package.mk
BUILD_PHONY_PACKAGE:= $(BUILD_SYSTEM)/phony_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_HOST_PREBUILT:= $(BUILD_SYSTEM)/host_prebuilt.mk
BUILD_PREBUILT:= $(BUILD_SYSTEM)/prebuilt.mk BUILD_PREBUILT:= $(BUILD_SYSTEM)/prebuilt.mk
BUILD_MULTI_PREBUILT:= $(BUILD_SYSTEM)/multi_prebuilt.mk BUILD_MULTI_PREBUILT:= $(BUILD_SYSTEM)/multi_prebuilt.mk