Merge "Change RRO enforcement logic"

am: 9c683dc968

Change-Id: I8a4ad0ece4e9ee0fc0112877fa0eb4d3f2b968ed
This commit is contained in:
Yo Chiang 2019-10-01 19:47:50 -07:00 committed by android-build-merger
commit 1876c3698d

View file

@ -99,7 +99,7 @@ include $(BUILD_SYSTEM)/support_libraries.mk
# Determine whether auto-RRO is enabled for this package.
enforce_rro_enabled :=
ifeq ($(PRODUCT_ENFORCE_RRO_TARGETS),*)
ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
# * means all system APKs, so enable conditionally based on module path.
# Note that base_rules.mk has not yet been included, so it's likely that only