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 --- flags/Android.bp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'flags/Android.bp') diff --git a/flags/Android.bp b/flags/Android.bp index 4f0241f91..81555a471 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -27,39 +27,15 @@ aconfig_declarations { java_aconfig_library { name: "permissions-aconfig-flags-lib", aconfig_declarations: "permissions-aconfig-flags", - sdk_version: "system_current", + sdk_version: "module_current", min_sdk_version: "30", apex_available: [ "com.android.permission", "test_com.android.permission", ], installable: false, + libs: ["framework-configinfrastructure"], visibility: [ "//packages/modules/Permission:__subpackages__", ], } - -java_library { - name: "permissions-flags-lib", - sdk_version: "system_current", - min_sdk_version: "30", - target_sdk_version: "34", - srcs: [ - "java/**/*.java", - ], - static_libs: [ - "permissions-aconfig-flags-lib", - ], - libs: [ - "androidx.annotation_annotation", - "framework-annotations-lib", - ], - apex_available: [ - "com.android.permission", - "test_com.android.permission", - ], - installable: false, - visibility: [ - "//packages/modules/Permission:__subpackages__", - ], -} \ No newline at end of file -- cgit v1.2.3-59-g8ed1b