From 4693fd1d0503c0154973b49ffbaff433966591bf Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Tue, 1 Oct 2019 12:55:26 +0800
Subject: [PATCH] Change RRO enforcement logic

Change RRO logic from
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS is '*'"
to
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS includes '*'"

Bug: b/137727426
Test: test build on local machine
Change-Id: I10b215c28919988ec58deb1fe3d5498ad4e73eb4
---
 core/package_internal.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 557a2c6160..eb3c67d801 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -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