Merge "Revert "Clean up unused lib/rules in build file"" into main

1 files changed, 7 insertions, 5 deletions

diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
index a0705cd5e..6d5cf69bd 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
@@ -1106,7 +1106,7 @@ public class RoleParser {
                     + ">");
             return fallbackValue;
         }
-        String className = applyJarjarTransformIfNeeded(value.substring(0, lastDotIndex));
+        String className = applyJarjarTransform(value.substring(0, lastDotIndex));
         String methodName = value.substring(lastDotIndex + 1);
         Method method;
         try {
@@ -1155,16 +1155,18 @@ public class RoleParser {
         };
     }
 
-    // LINT.IfChange(applyJarjarTransformIfNeeded)
+    // LINT.IfChange(applyJarjarTransform)
     /**
      * Simulate the jarjar transform that should happen on the class name.
      * <p>
      * Currently this only handles the {@code Flags} classes for feature flagging.
      */
     @NonNull
-    private String applyJarjarTransformIfNeeded(@NonNull String className) {
-        if (className.endsWith(".Flags") && Objects.equals(mContext.getPackageName(), "android")) {
-            return "com.android.permission.jarjar." + className;
+    private String applyJarjarTransform(@NonNull String className) {
+        if (className.endsWith(".Flags")) {
+            String jarjarPrefix = Objects.equals(mContext.getPackageName(), "android")
+                    ? "com.android.permission.jarjar." : "com.android.permissioncontroller.jarjar.";
+            return jarjarPrefix + className;
         }
         return className;
     }