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

Commit c62d15f0 authored by Anton Hansson's avatar Anton Hansson
Browse files

Skip auto-gen rro packages for path requirements. 

The way these packages are currently added to the build is via
modifications in product makefiles inheriting from mainline_system,
but with have the side effect of changing the REQURIED modules for
the source of the auto-gen RRO package.

Whitelist auto-generated RRO packages from the path requirement checks
for now.

Bug: 80410283
Test: make
Change-Id: Ib070e28e0ef87a57adfaedf6456585e8bfa29dd3
parent 401fada3

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -991,6 +991,8 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ 
  $(eval files += $(foreach cf,$(PRODUCTS.$(makefile).PRODUCT_COPY_FILES),\

    $(call append-path,$(PRODUCT_OUT),$(call word-colon,2,$(cf))))) \

  $(eval files := $(filter-out $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%,$(files))) \

  $(eval # RROs become REQUIRED by the source module, but are always placed on the vendor partition.) \

  $(eval files := $(filter-out %__auto_generated_rro.apk,$(files))) \

  $(eval offending_files := $(filter-out $(path_patterns) $(whitelist_patterns),$(files))) \

  $(call maybe-print-list-and-error,$(offending_files),$(makefile) produces files outside its artifact path requirement.) \

  $(eval unused_whitelist := $(filter-out $(files),$(whitelist_patterns))) \