From 795022cc68becd94bdc67b23ff8855cec114c619 Mon Sep 17 00:00:00 2001 From: Yi-an Chen Date: Tue, 29 Oct 2024 20:45:54 +0000 Subject: Revert "Clean up unused lib/rules in build file" This reverts commit 4e5889e2d0d1aab829ce72c0695a481fcb34657e. Reason for revert: Causing b/375725141 and resulting in method name conflicts for MTS on lower platforms that don't have jarjar_prefix Change-Id: I6987931531cd15acbede0ed2b741ad7f12cbd8cf --- PermissionController/Android.bp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'PermissionController/Android.bp') diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index 5c238806e..596b2dbb5 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -72,6 +72,11 @@ java_library { ], } +filegroup { + name: "PermissionController-jarjar-rules", + srcs: ["jarjar-rules.txt"], +} + android_library { name: "PermissionController-lib", sdk_version: "system_current", @@ -167,6 +172,9 @@ android_library { "//apex_available:platform", "com.android.permission", ], + + // TODO(b/313706381): Remove jarjar once flagging lib is fixed + jarjar_rules: ":PermissionController-jarjar-rules", } android_app { -- cgit v1.2.3-59-g8ed1b