From 245d9c0fa023e35a560961c536149205919a9c5a Mon Sep 17 00:00:00 2001 From: Richard MacGregor Date: Tue, 23 Jan 2024 15:27:59 -0800 Subject: Fix for permission mainline flagging Reduce complexity by deleting unused file and lib Add library to fix dependency cycle when using in module framework jar Bug: 291791417 Test: manual Flag: Exempt, build change Change-Id: Ia9087718ef2e9fb15a22c6682d7c9f36d05d0a28 --- framework-s/Android.bp | 1 + framework-s/jarjar-rules.txt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'framework-s') diff --git a/framework-s/Android.bp b/framework-s/Android.bp index d9d7aedaa..9ca8df7ba 100644 --- a/framework-s/Android.bp +++ b/framework-s/Android.bp @@ -79,6 +79,7 @@ java_sdk_library { "framework-permission-s-shared", "modules-utils-build", "android.permission.flags-aconfig-java", + "permissions-aconfig-flags-lib", ], apex_available: [ "com.android.permission", diff --git a/framework-s/jarjar-rules.txt b/framework-s/jarjar-rules.txt index 39f2ad3b7..da8f5a5f1 100644 --- a/framework-s/jarjar-rules.txt +++ b/framework-s/jarjar-rules.txt @@ -1,5 +1,8 @@ rule android.os.HandlerExecutor android.permission.jarjar.@0 -rule android.permission.flags.** android.permission.jarjar.@0 +rule android.permission.flags.*Flags* android.permission.jarjar.@0 +rule android.permission.flags.Flags android.permission.jarjar.@0 rule android.util.IndentingPrintWriter android.permission.jarjar.@0 rule com.android.internal.** android.permission.jarjar.@0 rule com.android.modules.** android.permission.jarjar.@0 +rule com.android.permission.flags.*Flags* android.permission.jarjar.@0 +rule com.android.permission.flags.Flags android.permission.jarjar.@0 -- cgit v1.2.3-59-g8ed1b