Merge "Revert "Add SupplementalProcess stubs and bootclasspath fragment""

Android.bp

@@ -178,7 +178,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.impl",
                 "framework-supplementalapi.impl",
             ],
         },

ApiDocs.bp

@@ -119,7 +119,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",

StubLibraries.bp

@@ -286,7 +286,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -304,7 +303,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -337,7 +335,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -366,7 +363,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -383,7 +379,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -416,7 +411,6 @@ java_library_with_nonpublic_deps {
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },

api/Android.bp

@@ -128,7 +128,6 @@ combined_apis {
         "i18n.module.public.api",
     ],
     conditional_bootclasspath: [
-        "framework-auxiliary",
         "framework-supplementalapi",
     ],
     system_server_classpath: [

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",