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

Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a am: 5e4e7ceca9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
This commit is contained in:
Anton Hansson
2021-01-21 14:02:57 +00:00
committed by Automerger Merge Worker
parent 17d13191a1 5e4e7ceca9
commit f118549ef7
3 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
StubLibraries.bp
View File

@@ -123,6 +123,20 @@ droidstubs {
new_since: ":android-non-updatable.api.public.latest",
},
},
dists: [
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
},
],
}
priv_apps =
@@ -162,6 +176,20 @@ droidstubs {
baseline_file: "core/api/system-lint-baseline.txt",
},
},
dists: [
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
},
],
}
droidstubs {
@@ -178,11 +206,32 @@ droidstubs {
baseline_file: "core/api/test-lint-baseline.txt",
},
},
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/test/api",
dest: "android.txt",
},
dists: [
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/test/api",
dest: "android.txt",
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/test/api",
dest: "removed.txt",
tag: ".removed-api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/test/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/test/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
},
],
}
droidstubs {
@@ -203,6 +252,20 @@ droidstubs {
new_since: ":android-non-updatable.api.module-lib.latest",
},
},
dists: [
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
},
],
}
/////////////////////////////////////////////////////////////////////

30
api/Android.bp
View File

@@ -52,10 +52,7 @@ genrule {
dest: "current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "android.txt",
},
@@ -112,6 +109,11 @@ genrule {
dir: "api",
dest: "removed.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "removed.txt",
},
],
}
@@ -139,10 +141,7 @@ genrule {
dest: "system-current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "android.txt",
},
@@ -173,6 +172,11 @@ genrule {
dir: "api",
dest: "system-removed.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "removed.txt",
},
],
visibility: ["//visibility:public"],
}
@@ -201,10 +205,7 @@ genrule {
dest: "module-lib-current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android.txt",
},
@@ -234,6 +235,11 @@ genrule {
dir: "api",
dest: "module-lib-removed.txt",
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "removed.txt",
},
],
}

19
services/Android.bp
View File

@@ -147,11 +147,20 @@ droidstubs {
baseline_file: "api/lint-baseline.txt",
},
},
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system-server/api",
dest: "android.txt",
},
dists: [
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system-server/api",
dest: "android.txt",
tag: ".api.txt"
},
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system-server/api",
dest: "removed.txt",
tag: ".removed-api.txt",
},
]
}
java_library {