diff options
author | Paul Duffin <paulduffin@google.com> | 2020-05-18 13:56:43 +0000 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2020-05-18 13:56:43 +0000 |
commit | 4774927799d31d47b0eaa10b9ba0ce6a756fb541 (patch) | |
tree | c22436cec753664fde91fbd6f8c0572dddc6186b /framework | |
parent | 63fde6a097711745f60c9e5b37d335f5da2dd1f8 (diff) | |
download | Permission-4774927799d31d47b0eaa10b9ba0ce6a756fb541.tar.gz |
Revert "Switch framework-permissions to use java_sdk_library"
This reverts commit 63fde6a097711745f60c9e5b37d335f5da2dd1f8.
Reason for revert: Breaks coverage build b/156892973
Bug: 156892973
Change-Id: Id00545e1b2179848d4324d7eacf18e3c3cc476ee
Diffstat (limited to 'framework')
-rw-r--r-- | framework/Android.bp | 98 |
1 files changed, 89 insertions, 9 deletions
diff --git a/framework/Android.bp b/framework/Android.bp index c43fabde8..68c27a832 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -21,18 +21,12 @@ filegroup { path: "java", } -java_sdk_library { +java_library { name: "framework-permission", - defaults: ["framework-module-defaults"], srcs: [ ":framework-permission-sources", ], - - // TODO(b/155480189) - Remove naming_scheme once references have been resolved. - // Temporary java_sdk_library component naming scheme to use to ease the transition from separate - // modules to java_sdk_library. - naming_scheme: "framework-modules", - + sdk_version: "module_current", apex_available: [ "com.android.permission", "test_com.android.permission", @@ -46,5 +40,91 @@ java_sdk_library { visibility: [ "//frameworks/base/apex/permission:__subpackages__", ], - stubs_library_visibility: ["//visibility:public"], +} + +stubs_defaults { + name: "framework-permission-stubs-defaults", + srcs: [ ":framework-permission-sources" ], + libs: [ "framework-annotations-lib" ], + dist: { dest: "framework-permission.txt" }, +} + +droidstubs { + name: "framework-permission-stubs-srcs-publicapi", + defaults: [ + "framework-module-stubs-defaults-publicapi", + "framework-permission-stubs-defaults", + ], + check_api: { + last_released: { + api_file: ":framework-permission.api.public.latest", + removed_api_file: ":framework-permission-removed.api.public.latest", + }, + api_lint: { + new_since: ":framework-permission.api.public.latest", + }, + }, +} + +droidstubs { + name: "framework-permission-stubs-srcs-systemapi", + defaults: [ + "framework-module-stubs-defaults-systemapi", + "framework-permission-stubs-defaults", + ], + check_api: { + last_released: { + api_file: ":framework-permission.api.system.latest", + removed_api_file: ":framework-permission-removed.api.system.latest", + }, + api_lint: { + new_since: ":framework-permission.api.system.latest", + }, + }, +} + +droidstubs { + name: "framework-permission-api-module_libs_api", + defaults: [ + "framework-module-api-defaults-module_libs_api", + "framework-permission-stubs-defaults", + ], + check_api: { + last_released: { + api_file: ":framework-permission.api.module-lib.latest", + removed_api_file: ":framework-permission-removed.api.module-lib.latest", + }, + api_lint: { + new_since: ":framework-permission.api.module-lib.latest", + }, + }, +} + +droidstubs { + name: "framework-permission-stubs-srcs-module_libs_api", + defaults: [ + "framework-module-stubs-defaults-module_libs_api", + "framework-permission-stubs-defaults", + ], +} + +java_library { + name: "framework-permission-stubs-publicapi", + srcs: [ ":framework-permission-stubs-srcs-publicapi" ], + defaults: ["framework-module-stubs-lib-defaults-publicapi"], + dist: { dest: "framework-permission.jar" }, +} + +java_library { + name: "framework-permission-stubs-systemapi", + srcs: [ ":framework-permission-stubs-srcs-systemapi" ], + defaults: ["framework-module-stubs-lib-defaults-systemapi"], + dist: { dest: "framework-permission.jar" }, +} + +java_library { + name: "framework-permission-stubs-module_libs_api", + srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ], + defaults: ["framework-module-stubs-lib-defaults-module_libs_api"], + dist: { dest: "framework-permission.jar" }, } |