Remove duplicate components from art-module-sdk

The art-module-sdk_art.module.public.api.stubs and
art-module-sdk_legacy.art.module.platform.api.stubs modules are no
longer needed in the sdk snapshot as they are provided by the
art.module.public.api and legacy.art.module.platform.api
java_sdk_library_import modules.

Ditto for the versioned instances of those modules.

Bug: 179354495
Test: m nothing
      art/build/build-art-module.sh
      - Compare generated Android.bp file with the hand modified
        one in this change to make sure that they match.
Change-Id: I55fb18b85f9bb587064e565d6d493630930d309b

2 files changed, 2 insertions, 68 deletions

diff --git a/1/Android.bp b/1/Android.bp
index 0cb25af9..fc19ea06 100644
--- a/1/Android.bp
+++ b/1/Android.bp
@@ -196,15 +196,6 @@ java_import {
 }
 
 java_import {
-    name: "art-module-sdk_art.module.public.api.stubs@1",
-    sdk_member_name: "art.module.public.api.stubs",
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license@1"],
-    jars: ["java/art.module.public.api.stubs.jar"],
-}
-
-java_import {
     name: "art-module-sdk_core-lambda-stubs-for-system-modules@1",
     sdk_member_name: "core-lambda-stubs-for-system-modules",
     visibility: ["//visibility:private"],
@@ -259,15 +250,6 @@ java_import {
 }
 
 java_import {
-    name: "art-module-sdk_legacy.art.module.platform.api.stubs@1",
-    sdk_member_name: "legacy.art.module.platform.api.stubs",
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license@1"],
-    jars: ["java/legacy.art.module.platform.api.stubs.jar"],
-}
-
-java_import {
     name: "art-module-sdk_stable.art.module.platform.api.stubs@1",
     sdk_member_name: "stable.art.module.platform.api.stubs",
     visibility: ["//visibility:private"],
diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp
index 5ced7f39..911d670f 100755
--- a/current/sdk/Android.bp
+++ b/current/sdk/Android.bp
@@ -466,30 +466,6 @@ art_prebuilt_java_import {
 }
 
 java_import {
-    name: "art-module-sdk_art.module.public.api.stubs@current",
-    sdk_member_name: "art.module.public.api.stubs",
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license@current"],
-    jars: ["java/art.module.public.api.stubs.jar"],
-}
-
-art_prebuilt_java_import {
-    name: "art-module-sdk_art.module.public.api.stubs",
-    // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
-    prefer: true,
-    soong_config_variables: {
-        source_build: {
-            prefer: false,
-        },
-    },
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license"],
-    jars: ["java/art.module.public.api.stubs.jar"],
-}
-
-java_import {
     name: "art-module-sdk_core-lambda-stubs-for-system-modules@current",
     sdk_member_name: "core-lambda-stubs-for-system-modules",
     visibility: ["//visibility:private"],
@@ -634,30 +610,6 @@ art_prebuilt_java_import {
 }
 
 java_import {
-    name: "art-module-sdk_legacy.art.module.platform.api.stubs@current",
-    sdk_member_name: "legacy.art.module.platform.api.stubs",
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license@current"],
-    jars: ["java/legacy.art.module.platform.api.stubs.jar"],
-}
-
-art_prebuilt_java_import {
-    name: "art-module-sdk_legacy.art.module.platform.api.stubs",
-    // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
-    prefer: true,
-    soong_config_variables: {
-        source_build: {
-            prefer: false,
-        },
-    },
-    visibility: ["//visibility:private"],
-    apex_available: ["//apex_available:platform"],
-    licenses: ["art-module-sdk_libcore_license"],
-    jars: ["java/legacy.art.module.platform.api.stubs.jar"],
-}
-
-java_import {
     name: "art-module-sdk_stable.art.module.platform.api.stubs@current",
     sdk_member_name: "stable.art.module.platform.api.stubs",
     visibility: ["//visibility:private"],
@@ -873,7 +825,7 @@ art_prebuilt_java_system_modules_import {
     ],
     licenses: ["art-module-sdk_libcore_license"],
     libs: [
-        "art-module-sdk_art.module.public.api.stubs",
+        "art.module.public.api.stubs",
         "art-module-sdk_core-lambda-stubs-for-system-modules",
         "art-module-sdk_core-generated-annotation-stubs",
         "art-module-sdk_art.module.api.annotations.for.system.modules",
@@ -956,7 +908,7 @@ art_prebuilt_java_system_modules_import {
         "//prebuilts:__subpackages__",
     ],
     licenses: ["art-module-sdk_libcore_license"],
-    libs: ["art-module-sdk_legacy.art.module.platform.api.stubs"],
+    libs: ["legacy.art.module.platform.api.stubs"],
 }
 
 java_system_modules_import {