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

Commit 95958eef authored by Anton Hansson's avatar Anton Hansson
Browse files

Change RRO default location to /product 

This changes the default location of RRO packages that don't
specify where they should be installed to /product instead of
/vendor.

Also change the auto-generated "enforced RRO" packages to install
on /product, and be explicit about that in the mk to make it
independent of the RRO default.

The reasoning for this change is that most overlays tend to be
for product level customizations, like themes and so on. RROs
for hardware related things can still be explicitly installed
on /vendor.

Bug: 123566903
Test: preubmit
Test: various internal tests
Change-Id: Ie7d5f19dc7ab421a7bcf584153f991e18e961cda
parent 375291fa

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services) 
# Clean up old location of hiddenapi files

$(call add-clean-step, rm -f $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi*)



# Clean up previous default location of RROs

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/build_rro_package.mk

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ endif 
partition :=

ifeq ($(LOCAL_ODM_MODULE),true)

  partition := $(TARGET_OUT_ODM)

else ifeq ($(LOCAL_PRODUCT_MODULE),true)

  partition := $(TARGET_OUT_PRODUCT)

else ifeq ($(LOCAL_VENDOR_MODULE),true)

  partition := $(TARGET_OUT_VENDOR)

else ifeq ($(LOCAL_PRODUCT_SERVICES_MODULE),true)

  partition := $(TARGET_OUT_PRODUCT_SERVICES)

else

  partition := $(TARGET_OUT_VENDOR)

  partition := $(TARGET_OUT_PRODUCT)

endif



ifeq ($(LOCAL_RRO_THEME),)

core/generate_enforce_rro.mk

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ LOCAL_CERTIFICATE := platform 


LOCAL_AAPT_FLAGS += --auto-add-overlay

LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays)

LOCAL_PRODUCT_MODULE := true



ifneq (,$(LOCAL_RES_LIBRARIES))

  # Technically we are linking against the app (if only to grab its resources),