Merge "Change RRO enforcement logic"
diff --git a/android/config.go b/android/config.go
index cb1bdf5..d03d38e 100644
--- a/android/config.go
+++ b/android/config.go
@@ -800,7 +800,7 @@
 func (c *config) EnforceRROForModule(name string) bool {
 	enforceList := c.productVariables.EnforceRROTargets
 	if enforceList != nil {
-		if len(enforceList) == 1 && (enforceList)[0] == "*" {
+		if InList("*", enforceList) {
 			return true
 		}
 		return InList(name, enforceList)