Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create all variants of stubs for permission"

Browse Source
This commit is contained in:
Anton Hansson
2020-02-04 14:34:07 +00:00
committed by Android (Google) Code Review
parent 3c187eb142 20a935052a
commit 7cde29c3c3
2 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@@ -469,7 +469,7 @@ java_library {
"framework-appsearch-stubs",
"framework-sdkextensions-stubs-systemapi",
"framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs
"framework-permission-stubs",
"framework-permission-stubs-systemapi",
"framework-wifi-stubs",
"ike-stubs",
],
@@ -520,7 +520,7 @@ java_library {
"framework-media-stubs-systemapi",
"framework_mediaprovider_stubs",
"framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
"framework-permission-stubs",
"framework-permission-stubs-systemapi",
"framework-sdkextensions-stubs-systemapi",
// TODO(b/146167933): Use framework-statsd-stubs instead.
"framework-statsd",

59
apex/permission/framework/Android.bp
View File

@@ -44,23 +44,66 @@ java_library {
],
}
stubs_defaults {
name: "framework-permission-stubs-defaults",
srcs: [ ":framework-permission-sources" ],
libs: [ "framework-annotations-lib" ],
sdk_version: "system_current",
}
droidstubs {
name: "framework-permission-stubs-sources",
srcs: [
":framework-annotations",
":framework-permission-sources",
name: "framework-permission-stubs-srcs-publicapi",
sdk_version: "system_current",
defaults: [
"framework-module-stubs-defaults-publicapi",
"framework-permission-stubs-defaults",
],
}
droidstubs {
name: "framework-permission-stubs-srcs-systemapi",
sdk_version: "system_current",
defaults: [
"framework-module-stubs-defaults-systemapi",
"framework-permission-stubs-defaults",
],
}
droidstubs {
name: "framework-permission-api-module_libs_api",
sdk_version: "system_current",
defaults: [
"framework-module-api-defaults-module_libs_api",
"framework-permission-stubs-defaults",
],
}
droidstubs {
name: "framework-permission-stubs-srcs-module_libs_api",
sdk_version: "system_current",
defaults: [
"framework-module-stubs-defaults-module_libs_api",
"framework-permission-stubs-defaults",
],
}
java_library {
name: "framework-permission-stubs",
srcs: [
":framework-permission-stubs-sources",
],
name: "framework-permission-stubs-publicapi",
srcs: [ ":framework-permission-stubs-srcs-publicapi" ],
sdk_version: "system_current",
installable: false,
}
java_library {
name: "framework-permission-stubs-systemapi",
srcs: [ ":framework-permission-stubs-srcs-systemapi" ],
sdk_version: "system_current",
installable: false,
}
java_library {
name: "framework-permission-stubs-module_libs_api",
srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ],
sdk_version: "system_current",
installable: false,
}