commit 9da401bb256d23722181c7bf22db5268e51aa513
author Yo Chiang <yochiang@google.com> Tue Oct 01 20:00:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 01 20:00:33 2019 -0700
tree c219b8cb28ae85a24080d037f403f294fd09c9f6
parent f77bfd56ec7f9bc84ef47538ea247beeb2052396
parent 95f16d563f2cb46bf374bef937d1e413a3f457ed

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

Change-Id: I65ba9497a94dd31c1b4d0a525552d5fe738d7f17

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