Revert "Add SupplementalProcess stubs and bootclasspath fragment"
Revert "Add bootclasspath config in Auxiliary." Revert "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS" Revert submission 16684516-auxiliary_bcp Reason for revert: pdk build breakage Reverted Changes: I8c92d2ccb:Add bootclasspath config in Auxiliary. I9ac910fa2:Add SupplementalProcess stubs and bootclasspath fr... I7cf3b31b0:Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS Bug: 216218564 Change-Id: Ie4374fed1e4869ae194b59e2298db785e647ed4f
This commit is contained in:
@@ -177,7 +177,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
static_libs: [
|
||||
"framework-auxiliary.impl",
|
||||
"framework-supplementalapi.impl",
|
||||
],
|
||||
},
|
||||
|
||||
@@ -116,7 +116,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",
|
||||
|
||||
@@ -285,7 +285,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
@@ -303,7 +302,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
@@ -336,7 +334,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
@@ -365,7 +362,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
static_libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
@@ -382,7 +378,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
static_libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
@@ -415,7 +410,6 @@ java_library_with_nonpublic_deps {
|
||||
soong_config_variables: {
|
||||
include_nonpublic_framework_api: {
|
||||
static_libs: [
|
||||
"framework-auxiliary.stubs",
|
||||
"framework-supplementalapi.stubs",
|
||||
],
|
||||
},
|
||||
|
||||
@@ -128,7 +128,6 @@ combined_apis {
|
||||
"i18n.module.public.api",
|
||||
],
|
||||
conditional_bootclasspath: [
|
||||
"framework-auxiliary",
|
||||
"framework-supplementalapi",
|
||||
],
|
||||
system_server_classpath: [
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user