drgreen/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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39b2203f51671a315c978d949a1d7dc51e1305b
This commit is contained in:
Anton Hansson
2021-01-21 13:48:49 +00:00
committed by Automerger Merge Worker
parent d386a2a2b9 d787b0501a
commit 5e4e7ceca9
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

@ -120,6 +120,20 @@ droidstubs {
new_since: ":android-non-updatable.api.public.latest", 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 = priv_apps =
@ -159,6 +173,20 @@ droidstubs {
baseline_file: "core/api/system-lint-baseline.txt", 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 { droidstubs {
@ -175,11 +203,32 @@ droidstubs {
baseline_file: "core/api/test-lint-baseline.txt", baseline_file: "core/api/test-lint-baseline.txt",
}, },
}, },
dist: { dists: [
targets: ["sdk", "win_sdk"], {
dir: "apistubs/android/test/api", targets: ["sdk", "win_sdk"],
dest: "android.txt", 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 { droidstubs {
@ -200,6 +249,20 @@ droidstubs {
new_since: ":android-non-updatable.api.module-lib.latest", 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

@ -50,10 +50,7 @@ genrule {
dest: "current.txt", dest: "current.txt",
}, },
{ {
targets: [ targets: ["sdk", "win_sdk"],
"sdk",
"win_sdk",
],
dir: "apistubs/android/public/api", dir: "apistubs/android/public/api",
dest: "android.txt", dest: "android.txt",
}, },
@ -106,6 +103,11 @@ genrule {
dir: "api", dir: "api",
dest: "removed.txt", dest: "removed.txt",
}, },
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "removed.txt",
},
], ],
} }
@ -131,10 +133,7 @@ genrule {
dest: "system-current.txt", dest: "system-current.txt",
}, },
{ {
targets: [ targets: ["sdk", "win_sdk"],
"sdk",
"win_sdk",
],
dir: "apistubs/android/system/api", dir: "apistubs/android/system/api",
dest: "android.txt", dest: "android.txt",
}, },
@ -163,6 +162,11 @@ genrule {
dir: "api", dir: "api",
dest: "system-removed.txt", dest: "system-removed.txt",
}, },
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "removed.txt",
},
], ],
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
} }
@ -189,10 +193,7 @@ genrule {
dest: "module-lib-current.txt", dest: "module-lib-current.txt",
}, },
{ {
targets: [ targets: ["sdk", "win_sdk"],
"sdk",
"win_sdk",
],
dir: "apistubs/android/module-lib/api", dir: "apistubs/android/module-lib/api",
dest: "android.txt", dest: "android.txt",
}, },
@ -220,6 +221,11 @@ genrule {
dir: "api", dir: "api",
dest: "module-lib-removed.txt", 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", baseline_file: "api/lint-baseline.txt",
}, },
}, },
dist: { dists: [
targets: ["sdk", "win_sdk"], {
dir: "apistubs/android/system-server/api", targets: ["sdk", "win_sdk"],
dest: "android.txt", 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 { java_library {