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

Merge "Remove references to win_sdk" am: dddbdc3b15 am: a9e069273a am: d8393273c3 am: a46d68e30e

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

Change-Id: I1ec863baceaa62ebedc669635928d5d981c30917
This commit is contained in:
Anton Hansson
2022-01-05 19:40:51 +00:00
committed by Automerger Merge Worker
parent a53ac9739c a46d68e30e
commit e73c58ed5a
4 changed files with 25 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
StubLibraries.bp
View File

@@ -67,19 +67,13 @@ droidstubs {
},
dists: [
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/public/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/public/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
@@ -123,19 +117,13 @@ droidstubs {
},
dists: [
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
@@ -159,37 +147,25 @@ droidstubs {
},
dists: [
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/test/api",
dest: "android.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/test/api",
dest: "removed.txt",
tag: ".removed-api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/test/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/test/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
@@ -218,19 +194,13 @@ droidstubs {
},
dists: [
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",
@@ -298,10 +268,7 @@ java_defaults {
java_version: "1.8",
compile_dex: true,
dist: {
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
tag: ".jar",
dest: "android-non-updatable.jar",
},
@@ -378,10 +345,7 @@ java_library_with_nonpublic_deps {
java_defaults {
name: "android_stubs_dists_default",
dist: {
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
tag: ".jar",
dest: "android.jar",
},
@@ -427,10 +391,7 @@ java_library_with_nonpublic_deps {
dists: [
{
// Legacy dist path
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
tag: ".jar",
dest: "android_system.jar",
},

45
api/Android.bp
View File

@@ -124,10 +124,7 @@ genrule {
dest: "current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/public/api",
dest: "android.txt",
},
@@ -217,10 +214,7 @@ genrule {
dest: "removed.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/public/api",
dest: "removed.txt",
},
@@ -260,10 +254,7 @@ genrule {
dest: "system-current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system/api",
dest: "android.txt",
},
@@ -322,10 +313,7 @@ genrule {
dest: "system-removed.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system/api",
dest: "removed.txt",
},
@@ -366,10 +354,7 @@ genrule {
dest: "module-lib-current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android.txt",
},
@@ -430,10 +415,7 @@ genrule {
dest: "module-lib-removed.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/module-lib/api",
dest: "removed.txt",
},
@@ -474,10 +456,7 @@ genrule {
dest: "system-server-current.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system-server/api",
dest: "android.txt",
},
@@ -501,10 +480,7 @@ genrule {
dest: "system-server-removed.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system-server/api",
dest: "removed.txt",
},
@@ -546,9 +522,6 @@ genrule {
tools: ["api_versions_trimmer"],
cmd: "$(location api_versions_trimmer) $(out) $(in)",
dist: {
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
},
}

10
services/Android.bp
View File

@@ -224,19 +224,13 @@ droidstubs {
},
dists: [
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system-server/api",
dest: "android-non-updatable.txt",
tag: ".api.txt",
},
{
targets: [
"sdk",
"win_sdk",
],
targets: ["sdk"],
dir: "apistubs/android/system-server/api",
dest: "android-non-updatable-removed.txt",
tag: ".removed-api.txt",

2
test-legacy/Android.mk
View File

@@ -41,6 +41,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
include $(BUILD_STATIC_JAVA_LIBRARY)
# Archive a copy of the classes.jar in SDK build.
$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)
$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)
endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true