commit f2bb5e0c5f0a3927637af56f5c05c5e3b763dd8d
author Frank Wang <xueyiwang@google.com> Thu Jan 20 23:07:58 2022 +0000
committer Frank Wang <xueyiwang@google.com> Mon Jan 24 15:55:40 2022 +0000
tree de7d4324b745eef7daba891c8e39849b694ccf5e
parent 5c57f3bebf213c5a3458e5aece6d3b724f35d8d6

Add SupplementalProcess stubs and bootclasspath fragment

Test: Builds
Bug: b/210728915
Change-Id: I9ac910fa2275eb68faed05a800e990eef6a1fe90

Android.bp

diff --git a/Android.bp b/Android.bp
index cc754f2..b3b0a9a 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 4aecc8f..6f92f01 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -116,6 +116,7 @@
         ":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 77b26f8..fcb319a 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -285,6 +285,7 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -302,6 +303,7 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -334,6 +336,7 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -362,6 +365,7 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -378,6 +382,7 @@
     soong_config_variables: {
         include_nonpublic_framework_api: {
             static_libs: [
+                "framework-auxiliary.stubs",
                 "framework-supplementalapi.stubs",
             ],
         },
@@ -410,6 +415,7 @@
     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 a22c2f6..9428fcc 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -128,6 +128,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",
         },