diff options
| author | 2024-01-26 13:13:06 +0000 | |
|---|---|---|
| committer | 2024-01-26 13:13:06 +0000 | |
| commit | a9d4ed55dd47ff183b24d18f2a00963d40b83164 (patch) | |
| tree | a38c0d7ce3f77fb657b9c310bd3540b366ec8be7 /flags/Android.bp | |
| parent | fcc62ad0d77d622b4ed875fdb64c6949c89a0c0d (diff) | |
| parent | 245d9c0fa023e35a560961c536149205919a9c5a (diff) | |
Merge "Fix for permission mainline flagging" into main
Diffstat (limited to 'flags/Android.bp')
| -rw-r--r-- | flags/Android.bp | 28 |
1 files changed, 2 insertions, 26 deletions
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 |