From d07b757a6a891f3a10279742be6ad928af406fac Mon Sep 17 00:00:00 2001
From: Johnny Lee <johnnlee@google.com>
Date: Tue, 25 Jan 2022 06:58:55 +0000
Subject: [PATCH] Revert "Add SupplementalProcess stubs and bootclasspath
 fragment"

Revert "Add bootclasspath config in Auxiliary."

Revert "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS"

Revert submission 16684516-auxiliary_bcp

Reason for revert: pdk build breakage
Reverted Changes:
I8c92d2ccb:Add bootclasspath config in Auxiliary.
I9ac910fa2:Add SupplementalProcess stubs and bootclasspath fr...
I7cf3b31b0:Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS

Bug: 216218564
Change-Id: Ie4374fed1e4869ae194b59e2298db785e647ed4f
---
 Android.bp       | 1 -
 ApiDocs.bp       | 1 -
 StubLibraries.bp | 6 ------
 api/Android.bp   | 1 -
 boot/Android.bp  | 4 ----
 5 files changed, 13 deletions(-)

diff --git a/Android.bp b/Android.bp
index b3b0a9a3fb226..cc754f21902a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,7 +177,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.impl",
                 "framework-supplementalapi.impl",
             ],
         },
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 6f92f01d67237..4aecc8fe45049 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -116,7 +116,6 @@ stubs_defaults {
         ":i18n.module.public.api{.public.stubs.source}",
 
         ":framework-appsearch-sources",
-        ":framework-auxiliary-sources",
         ":framework-connectivity-sources",
         ":framework-connectivity-tiramisu-updatable-sources",
         ":framework-graphics-srcs",
diff --git a/StubLibraries.bp b/StubLibraries.bp
index fcb319a81cf6d..77b26f80ab976 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -285,7 +285,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -303,7 +302,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -336,7 +334,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -365,7 +362,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -382,7 +378,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -415,7 +410,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
diff --git a/api/Android.bp b/api/Android.bp
index 9428fcc41b812..a22c2f6af35a7 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -128,7 +128,6 @@ combined_apis {
         "i18n.module.public.api",
     ],
     conditional_bootclasspath: [
-        "framework-auxiliary",
         "framework-supplementalapi",
     ],
     system_server_classpath: [
diff --git a/boot/Android.bp b/boot/Android.bp
index 8958d70f63cf1..3273f2c6ed8ef 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -55,10 +55,6 @@ platform_bootclasspath {
             apex: "com.android.art",
             module: "art-bootclasspath-fragment",
         },
-        {
-            apex: "com.android.auxiliary",
-            module: "com.android.auxiliary-bootclasspath-fragment",
-        },
         {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",