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

Merge "Run bpfmt on StubLibraries.bp"

Browse Source
This commit is contained in:
Anton Hansson
2021-04-14 17:23:42 +00:00
committed by Gerrit Code Review
parent a48ee296ee 240ee48eec
commit cf54ae883b
1 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
StubLibraries.bp
View File

@@ -120,13 +120,19 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/public/api", dir: "apistubs/android/public/api",
dest: "android-non-updatable.txt", dest: "android-non-updatable.txt",
tag: ".api.txt", tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/public/api", dir: "apistubs/android/public/api",
dest: "android-non-updatable-removed.txt", dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
@@ -134,20 +140,17 @@ droidstubs {
], ],
} }
priv_apps = priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
"\\)" "\\)"
priv_apps_in_stubs = priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
" --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" + "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
"\\)" "\\)"
test = " --show-annotation android.annotation.TestApi" test = " --show-annotation android.annotation.TestApi"
module_libs = module_libs = " --show-annotation android.annotation.SystemApi\\(" +
" --show-annotation android.annotation.SystemApi\\(" +
"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" + "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
"\\)" "\\)"
@@ -163,7 +166,7 @@ droidstubs {
last_released: { last_released: {
api_file: ":android-non-updatable.api.system.latest", api_file: ":android-non-updatable.api.system.latest",
removed_api_file: ":android-non-updatable-removed.api.system.latest", removed_api_file: ":android-non-updatable-removed.api.system.latest",
baseline_file: ":android-non-updatable-incompatibilities.api.system.latest" baseline_file: ":android-non-updatable-incompatibilities.api.system.latest",
}, },
api_lint: { api_lint: {
enabled: true, enabled: true,
@@ -173,13 +176,19 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system/api", dir: "apistubs/android/system/api",
dest: "android-non-updatable.txt", dest: "android-non-updatable.txt",
tag: ".api.txt", tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/system/api", dir: "apistubs/android/system/api",
dest: "android-non-updatable-removed.txt", dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
@@ -203,25 +212,37 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/test/api", dir: "apistubs/android/test/api",
dest: "android.txt", dest: "android.txt",
tag: ".api.txt", tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/test/api", dir: "apistubs/android/test/api",
dest: "removed.txt", dest: "removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/test/api", dir: "apistubs/android/test/api",
dest: "android-non-updatable.txt", dest: "android-non-updatable.txt",
tag: ".api.txt", tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/test/api", dir: "apistubs/android/test/api",
dest: "android-non-updatable-removed.txt", dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
@@ -249,13 +270,19 @@ droidstubs {
}, },
dists: [ dists: [
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/module-lib/api", dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable.txt", dest: "android-non-updatable.txt",
tag: ".api.txt", tag: ".api.txt",
}, },
{ {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
dir: "apistubs/android/module-lib/api", dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable-removed.txt", dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt", tag: ".removed-api.txt",
@@ -307,10 +334,13 @@ java_defaults {
java_version: "1.8", java_version: "1.8",
compile_dex: true, compile_dex: true,
dist: { dist: {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
tag: ".jar", tag: ".jar",
dest: "android-non-updatable.jar", dest: "android-non-updatable.jar",
} },
} }
java_library_static { java_library_static {
@@ -369,7 +399,10 @@ java_defaults {
java_defaults { java_defaults {
name: "android_stubs_dists_default", name: "android_stubs_dists_default",
dist: { dist: {
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
tag: ".jar", tag: ".jar",
dest: "android.jar", dest: "android.jar",
}, },
@@ -400,7 +433,10 @@ java_library_static {
dists: [ dists: [
{ {
// Legacy dist path // Legacy dist path
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
tag: ".jar", tag: ".jar",
dest: "android_system.jar", dest: "android_system.jar",
}, },
@@ -425,7 +461,10 @@ java_library_static {
dists: [ dists: [
{ {
// Legacy dist path // Legacy dist path
targets: ["sdk", "win_sdk"], targets: [
"sdk",
"win_sdk",
],
tag: ".jar", tag: ".jar",
dest: "android_test.jar", dest: "android_test.jar",
}, },