commit 95f16d563f2cb46bf374bef937d1e413a3f457ed
author Yo Chiang <yochiang@google.com> Tue Oct 01 19:54:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 01 19:54:09 2019 -0700
tree c219b8cb28ae85a24080d037f403f294fd09c9f6
parent f8094afbefca7528e46f48ed72ac1e7d1fed657f
parent 1876c3698df885f1ef23f0c25ff867900cf52ae8

Merge "Change RRO enforcement logic" am: 9c683dc968
am: 1876c3698d

Change-Id: Ib147dab336cfcd2a6efa7547db7717f75342335c

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 557a2c6..eb3c67d 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -99,7 +99,7 @@
 
 # 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