commit 07861f70d3049f93d67dc59c1dd78ad21cb6918e
author Frank Wang <xueyiwang@google.com> Tue Jan 25 18:41:45 2022 +0000
committer Frank Wang <xueyiwang@google.com> Thu Jan 27 07:52:21 2022 +0000
tree 32d9b04ff191fef7f78c047bcd16efdb63ae9b69
parent 32a66eac2692c438efe15a1b7e72f19e435123f4

Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."

Revert^2 "Add bootclasspath config in Auxiliary."

ba33413304d140c02bd8d2477576fb19889af031

Change-Id: I2e8f05406c90565b517f5d7d05aae0dc6d8a4200

Android.bp

diff --git a/Android.bp b/Android.bp
index 8bc5d7a..838f304 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,6 +177,7 @@
     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 c50d446..a193b78 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -101,6 +101,7 @@
         ":i18n.module.public.api{.public.stubs.source}",
 
         ":framework-appsearch-sources",
+        ":framework-auxiliary-sources",
         ":framework-connectivity-sources",
         ":framework-bluetooth-sources",
         ":framework-connectivity-tiramisu-updatable-sources",

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index d8727f9..3075d38 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -129,6 +129,7 @@
         "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 3273f2c..8958d70 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -56,6 +56,10 @@
             module: "art-bootclasspath-fragment",
         },
         {
+            apex: "com.android.auxiliary",
+            module: "com.android.auxiliary-bootclasspath-fragment",
+        },
+        {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",
         },