From dd8ef67a61a0b2f6345edc6a1d0bdffc691cd2ab Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 4 Jan 2022 08:53:19 +0000 Subject: [PATCH] Remove references to win_sdk This goal doesn't exist anymore. The build system automatically translates it to "sdk". Test: m win_sdk dist && inspect out/dist/apistubs Change-Id: Ifc4fb07ce32ef21906e8bb8eae0003b1486a525a --- StubLibraries.bp | 65 +++++++++--------------------------------- api/Android.bp | 45 ++++++----------------------- services/Android.bp | 10 ++----- test-legacy/Android.mk | 2 +- 4 files changed, 25 insertions(+), 97 deletions(-) diff --git a/StubLibraries.bp b/StubLibraries.bp index d090296523ed..dd8ecd5d29d7 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -59,19 +59,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", @@ -115,19 +109,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", @@ -151,37 +139,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", @@ -210,19 +186,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", @@ -282,10 +252,7 @@ java_defaults { java_version: "1.8", compile_dex: true, dist: { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], tag: ".jar", dest: "android-non-updatable.jar", }, @@ -341,10 +308,7 @@ java_library { java_defaults { name: "android_stubs_dists_default", dist: { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], tag: ".jar", dest: "android.jar", }, @@ -376,10 +340,7 @@ java_library { dists: [ { // Legacy dist path - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], tag: ".jar", dest: "android_system.jar", }, diff --git a/api/Android.bp b/api/Android.bp index ed2247b6eaa4..c6ea175954c9 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -120,10 +120,7 @@ genrule { dest: "current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/public/api", dest: "android.txt", }, @@ -205,10 +202,7 @@ genrule { dest: "removed.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/public/api", dest: "removed.txt", }, @@ -244,10 +238,7 @@ genrule { dest: "system-current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/system/api", dest: "android.txt", }, @@ -302,10 +293,7 @@ genrule { dest: "system-removed.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/system/api", dest: "removed.txt", }, @@ -342,10 +330,7 @@ genrule { dest: "module-lib-current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/module-lib/api", dest: "android.txt", }, @@ -402,10 +387,7 @@ genrule { dest: "module-lib-removed.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/module-lib/api", dest: "removed.txt", }, @@ -446,10 +428,7 @@ genrule { dest: "system-server-current.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/system-server/api", dest: "android.txt", }, @@ -473,10 +452,7 @@ genrule { dest: "system-server-removed.txt", }, { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], dir: "apistubs/android/system-server/api", dest: "removed.txt", }, @@ -514,9 +490,6 @@ genrule { tools: ["api_versions_trimmer"], cmd: "$(location api_versions_trimmer) $(out) $(in)", dist: { - targets: [ - "sdk", - "win_sdk", - ], + targets: ["sdk"], }, } diff --git a/services/Android.bp b/services/Android.bp index e11b0442377e..841edc7ed509 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -221,19 +221,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", diff --git a/test-legacy/Android.mk b/test-legacy/Android.mk index ce5e4cf46695..284008c5be71 100644 --- a/test-legacy/Android.mk +++ b/test-legacy/Android.mk @@ -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