diff options
| -rw-r--r-- | PermissionController/Android.bp | 2 | ||||
| -rw-r--r-- | PermissionController/tests/mocking/Android.bp | 2 | ||||
| -rw-r--r-- | flags/Android.bp | 28 | ||||
| -rw-r--r-- | flags/java/com/android/permission/flags/PermissionsFlags.java | 20 | ||||
| -rw-r--r-- | framework-s/Android.bp | 1 | ||||
| -rw-r--r-- | framework-s/jarjar-rules.txt | 2 | ||||
| -rw-r--r-- | service/Android.bp | 1 | ||||
| -rw-r--r-- | service/jarjar-rules.txt | 2 |
8 files changed, 10 insertions, 48 deletions
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index 1380c5330..b16999d9c 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -146,7 +146,7 @@ android_library { "lottie", "safety-label", "role-controller", - "permissions-flags-lib", + "permissions-aconfig-flags-lib", "android.permission.flags-aconfig-java", "androidx.compose.foundation_foundation", "androidx.compose.runtime_runtime", diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp index 416e14847..430e58d69 100644 --- a/PermissionController/tests/mocking/Android.bp +++ b/PermissionController/tests/mocking/Android.bp @@ -116,7 +116,7 @@ android_test { "safety-label", "role-controller", "lottie", - "permissions-flags-lib", + "permissions-aconfig-flags-lib", "android.permission.flags-aconfig-java", "androidx.test.rules", 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 diff --git a/flags/java/com/android/permission/flags/PermissionsFlags.java b/flags/java/com/android/permission/flags/PermissionsFlags.java deleted file mode 100644 index afab3fae5..000000000 --- a/flags/java/com/android/permission/flags/PermissionsFlags.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.permission.flags; - -/** Class used for flags that do not work with aconfig tooling */ -public final class PermissionsFlags {} diff --git a/framework-s/Android.bp b/framework-s/Android.bp index 6d36feb09..a23d91197 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 22e1da3ac..da8f5a5f1 100644 --- a/framework-s/jarjar-rules.txt +++ b/framework-s/jarjar-rules.txt @@ -4,3 +4,5 @@ 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 diff --git a/service/Android.bp b/service/Android.bp index 6850d26bd..0702c279b 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -110,6 +110,7 @@ java_sdk_library { "service-permission-statsd", "service-permission-proto-stream", "android.permission.flags-aconfig-java", + "permissions-aconfig-flags-lib", ], errorprone: { javacflags: ["-Xep:GuardedBy:ERROR"], diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 495388afe..299cc4529 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -4,6 +4,8 @@ rule android.permission.flags.Flags com.android.permission.jarjar.@0 rule android.util.IndentingPrintWriter com.android.permission.jarjar.@0 rule com.android.internal.** com.android.permission.jarjar.@0 rule com.android.modules.** com.android.permission.jarjar.@0 +rule com.android.permission.flags.*Flags* com.android.permission.jarjar.@0 +rule com.android.permission.flags.Flags com.android.permission.jarjar.@0 rule com.android.role.*Proto com.android.permission.jarjar.@0 # TODO(b/236200992): Revisit addition of rule com.android.safetycenter.annotations, # com.android.safetycenter.internaldata, com.android.safetycenter.pendingintents and |