commit fb385e8b14e1aad239fb515068c7adceefa19ca4
author Ken Sun <kensun@google.com> Tue Jan 25 09:08:59 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 25 09:08:59 2022 +0000
tree a83e48a89042bfa8e6476ac5c61ac0a307e7378e
parent f99ad2c65434f4e75685e25a65bc3374742cbf98
parent d07b757a6a891f3a10279742be6ad928af406fac

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 72bd642..8d82b38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -178,7 +178,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.impl",
                 "framework-supplementalapi.impl",
             ],
         },

ApiDocs.bp

diff --git a/ApiDocs.bp b/ApiDocs.bp
index ca211c1..98d071e 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -119,7 +119,6 @@
         ":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

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 7f7380a..8a15758 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -286,7 +286,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -304,7 +303,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -337,7 +335,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -366,7 +363,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -383,7 +379,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -416,7 +411,6 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
-                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index 9428fcc..a22c2f6 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -128,7 +128,6 @@
         "i18n.module.public.api",
     ],
     conditional_bootclasspath: [
-        "framework-auxiliary",
         "framework-supplementalapi",
     ],
     system_server_classpath: [

boot/Android.bp

diff --git a/boot/Android.bp b/boot/Android.bp
index 8958d70..3273f2c 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -56,10 +56,6 @@
             module: "art-bootclasspath-fragment",
         },
         {
-            apex: "com.android.auxiliary",
-            module: "com.android.auxiliary-bootclasspath-fragment",
-        },
-        {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",
         },