Revert "Add aliases for -nodeps targets"

Revert submission 3023343-nodeps

Reason for revert: b/335445789

Reverted changes: /q/submissionid:3023343-nodeps

Merged-In: Ia903920e5f2345e9640e56be832c64ea35eb9c11
Change-Id: Ie5a37527fff8282730fff7dee9e438e37fd6ccac

2 files changed, 0 insertions, 121 deletions

diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index 8fa3f68ce..5ab4539bc 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -14,121 +14,4 @@ package {
     default_applicable_licenses: ["prebuilts_sdk_license"],
 }
 
-android_library {
-    name: "androidx.annotation_annotation-experimental-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.annotation_annotation-experimental",
-    ],
-}
-
-android_library {
-    name: "androidx.annotation_annotation-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.annotation_annotation",
-    ],
-}
-
-android_library {
-    name: "androidx.collection_collection-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.collection_collection",
-    ],
-}
-
-android_library {
-    name: "androidx.core_core-animation-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.core_core-animation",
-    ],
-}
-
-android_library {
-    name: "androidx.core_core-animation-testing-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.core_core-animation-testing",
-    ],
-}
-
-android_library {
-    name: "androidx.core_core-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.core_core",
-    ],
-}
-
-android_library {
-    name: "androidx.leanback_leanback-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.leanback_leanback",
-    ],
-}
-
-android_library {
-    name: "androidx.transition_transition-ktx-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.transition_transition-ktx",
-    ],
-}
-
-android_library {
-    name: "androidx.webkit_webkit-nodeps",
-    sdk_version: "31",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.webkit_webkit",
-    ],
-}
-
 build = ["JavaPlugins.bp"]
diff --git a/current/androidx/AndroidManifest.xml b/current/androidx/AndroidManifest.xml
deleted file mode 100644
index 33235bb26..000000000
--- a/current/androidx/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.nodeps.manifest.stub">
-</manifest>