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

Commit 1e510c76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sort/dedup PRODUCT_PACKAGES" into main

parents 41cc29ac 51c983bb
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -276,6 +276,19 @@ ifneq ($(ALLOW_RULES_IN_PRODUCT_CONFIG),)
_product_config_saved_KATI_ALLOW_RULES :=
endif

# Sort/dedup all PRODUCT_PACKAGES variables. This is every PRODUCT_PACKAGES_* variable that appears
# in product-installed-modules.
PRODUCT_PACKAGES := $(sort $(PRODUCT_PACKAGES))
PRODUCT_PACKAGES_DEBUG := $(sort $(PRODUCT_PACKAGES_DEBUG))
PRODUCT_PACKAGES_ENG := $(sort $(PRODUCT_PACKAGES_ENG))
PRODUCT_PACKAGES_TESTS := $(sort $(PRODUCT_PACKAGES_TESTS))
PRODUCT_PACKAGES_DEBUG_ASAN := $(sort $(PRODUCT_PACKAGES_DEBUG_ASAN))
PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := $(sort $(PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE))
PRODUCT_PACKAGES_ARM64 := $(sort $(PRODUCT_PACKAGES_ARM64))
PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29))
PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_33))
PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 := $(sort $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34))

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

current_product_makefile :=