From 90037453608363457752f2e0d84033ea8cbf5046 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Sat, 8 Feb 2020 13:49:17 +0000
Subject: [PATCH] Build permission against the module SDK

Bug: 146757305
Test: m
Change-Id: I6a2f8c9340051497770811f631ffb72debbf0b23
---
 apex/permission/framework/Android.bp | 8 +-------
 apex/permission/service/Android.bp   | 5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index 126fa00a31f05..6d962008460f5 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/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/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 4172e95bca5bc..8d6643123c6d3 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/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: [