From 07861f70d3049f93d67dc59c1dd78ad21cb6918e Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Tue, 25 Jan 2022 18:41:45 +0000 Subject: [PATCH] Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..." Revert^2 "Add bootclasspath config in Auxiliary." ba33413304d140c02bd8d2477576fb19889af031 Change-Id: I2e8f05406c90565b517f5d7d05aae0dc6d8a4200 --- Android.bp | 1 + ApiDocs.bp | 1 + api/Android.bp | 1 + boot/Android.bp | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/Android.bp b/Android.bp index 8bc5d7aa0cd98..838f304b2e8e1 100644 --- a/Android.bp +++ b/Android.bp @@ -177,6 +177,7 @@ 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 c50d44634e43b..a193b78cd4d15 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -101,6 +101,7 @@ stubs_defaults { ":i18n.module.public.api{.public.stubs.source}", ":framework-appsearch-sources", + ":framework-auxiliary-sources", ":framework-connectivity-sources", ":framework-bluetooth-sources", ":framework-connectivity-tiramisu-updatable-sources", diff --git a/api/Android.bp b/api/Android.bp index d8727f98a22cd..3075d385f1ca1 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -129,6 +129,7 @@ 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 3273f2c6ed8ef..8958d70f63cf1 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -55,6 +55,10 @@ 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",