diff options
| -rw-r--r-- | framework/Android.bp | 8 | ||||
| -rw-r--r-- | service/Android.bp | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/framework/Android.bp b/framework/Android.bp index 126fa00a3..6d9620084 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -26,13 +26,7 @@ java_library { srcs: [ ":framework-permission-sources", ], - // TODO(b/146758669): Use "system_current" after nullability annotations are system APIs. - sdk_version: "core_current", - libs: [ - "framework-annotations-lib", - // TODO(b/146758669): Remove this line after nullability annotations are system APIs. - "android_system_stubs_current", - ], + sdk_version: "module_current", apex_available: [ "com.android.permission", "test_com.android.permission", diff --git a/service/Android.bp b/service/Android.bp index 4172e95bc..8d6643123 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -24,12 +24,9 @@ java_library { srcs: [ ":service-permission-sources", ], - // TODO(b/146758669): Use "system_current" after nullability annotations are system APIs. - sdk_version: "core_current", + sdk_version: "module_current", libs: [ "framework-annotations-lib", - // TODO(b/146758669): Remove this line after nullability annotations are system APIs. - "android_system_stubs_current", "framework-permission", ], apex_available: [ |