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

Commit 84973f87 authored by Jakub Adámek's avatar Jakub Adámek Committed by Android (Google) Code Review
Browse files

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

parents 73cead3e a08a1015

core/base_rules.mk

+4 −1
Original line number Diff line number Diff line
@@ -210,7 +210,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

core/build_rro_package.mk

0 → 100644
+22 −0
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.

##

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



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

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ LOCAL_CLANG_64:= 
LOCAL_INIT_RC_32:=

LOCAL_INIT_RC_64:=

LOCAL_JAVA_LANGUAGE_VERSION:=

LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=

LOCAL_RRO_SKU:=



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

# iterate over thousands of entries every time.

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,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