diff options
| author | 2020-02-08 13:49:17 +0000 | |
|---|---|---|
| committer | 2020-02-08 13:49:57 +0000 | |
| commit | a63328bf5398cf38da0ad17ff541036781a6df92 (patch) | |
| tree | 67458e5f2872d4521623dbb81f04025585601990 | |
| parent | 9c2ebd60d24828cc94adc1031d4911a4189cfc90 (diff) | |
Build permission against the module SDK
Bug: 146757305
Test: m
Change-Id: I6a2f8c9340051497770811f631ffb72debbf0b23
| -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: [ |