From bddffaa432894c806b5c1b2c93ecb01d5cb3daf7 Mon Sep 17 00:00:00 2001 From: Gavin Corkery Date: Mon, 15 Nov 2021 20:39:32 +0000 Subject: [PATCH] Revert "Add SupplementalProcess stubs and bootclasspath fragment" Revert "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS" Revert "Add framework-supplementalprocess prebuilts" Revert submission 16194363-supplementalprocess-stubs Reason for revert: PDK build break Reverted Changes: Ie1d3605d2:Add SupplementalProcess stubs and bootclasspath fr... I1ea34faba:Add framework-supplementalprocess to PRODUCT_APEX_... I8ef2a4c0f:Add jars and fragment to SupplementalProcess apex Ibf9444f89:Add framework-supplementalprocess prebuilts Change-Id: Ic569389a4b3a54323c283e9573590686ce27f491 --- Android.bp | 2 -- ApiDocs.bp | 3 --- StubLibraries.bp | 2 -- api/Android.bp | 8 -------- boot/Android.bp | 4 ---- 5 files changed, 19 deletions(-) diff --git a/Android.bp b/Android.bp index dddcb2535f5ff..e1cb037b252e0 100644 --- a/Android.bp +++ b/Android.bp @@ -154,7 +154,6 @@ java_library { "framework-scheduling.stubs.module_lib", "framework-sdkextensions.stubs.module_lib", "framework-statsd.stubs.module_lib", - "framework-supplementalprocess.stubs.module_lib", "framework-tethering.stubs.module_lib", "framework-uwb.stubs.module_lib", "framework-wifi.stubs.module_lib", @@ -178,7 +177,6 @@ java_library { "framework-scheduling.impl", "framework-sdkextensions.impl", "framework-statsd.impl", - "framework-supplementalprocess.impl", "framework-tethering.impl", "framework-uwb.impl", "framework-wifi.impl", diff --git a/ApiDocs.bp b/ApiDocs.bp index 7a4ef2ab325a2..31f7f6e014c30 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -126,7 +126,6 @@ stubs_defaults { ":framework-scheduling-sources", ":framework-sdkextensions-sources", ":framework-statsd-sources", - ":framework-supplementalprocess-sources", ":framework-tethering-srcs", ":framework-uwb-updatable-sources", ":framework-wifi-updatable-sources", @@ -173,7 +172,6 @@ droidstubs { ":framework-scheduling{.public.stubs.source}", ":framework-sdkextensions{.public.stubs.source}", ":framework-statsd{.public.stubs.source}", - ":framework-supplementalprocess{.public.stubs.source}", ":framework-tethering{.public.stubs.source}", ":framework-uwb{.public.stubs.source}", ":framework-wifi{.public.stubs.source}", @@ -213,7 +211,6 @@ genrule { ":framework-scheduling{.public.annotations.zip}", ":framework-sdkextensions{.public.annotations.zip}", ":framework-statsd{.public.annotations.zip}", - ":framework-supplementalprocess{.public.annotations.zip}", ":framework-tethering{.public.annotations.zip}", ":framework-uwb{.public.annotations.zip}", ":framework-wifi{.public.annotations.zip}", diff --git a/StubLibraries.bp b/StubLibraries.bp index b6fd708a6cceb..cc118f32f8bfd 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -250,7 +250,6 @@ modules_public_stubs = [ "framework-scheduling.stubs", "framework-sdkextensions.stubs", "framework-statsd.stubs", - "framework-supplementalprocess.stubs", "framework-tethering.stubs", "framework-uwb.stubs", "framework-wifi.stubs", @@ -272,7 +271,6 @@ modules_system_stubs = [ "framework-scheduling.stubs.system", "framework-sdkextensions.stubs.system", "framework-statsd.stubs.system", - "framework-supplementalprocess.stubs", "framework-tethering.stubs.system", "framework-uwb.stubs.system", "framework-wifi.stubs.system", diff --git a/api/Android.bp b/api/Android.bp index 1ec1b3c6ba939..1bc50bd409a29 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -106,7 +106,6 @@ genrule { ":framework-scheduling{.public.api.txt}", ":framework-sdkextensions{.public.api.txt}", ":framework-statsd{.public.api.txt}", - ":framework-supplementalprocess{.public.api.txt}", ":framework-tethering{.public.api.txt}", ":framework-uwb{.public.api.txt}", ":framework-wifi{.public.api.txt}", @@ -168,7 +167,6 @@ genrule { ":framework-scheduling{.public.stubs.source}", ":framework-sdkextensions{.public.stubs.source}", ":framework-statsd{.public.stubs.source}", - ":framework-supplementalprocess{.public.stubs.source}", ":framework-tethering{.public.stubs.source}", ":framework-uwb{.public.stubs.source}", ":framework-wifi{.public.stubs.source}", @@ -197,7 +195,6 @@ genrule { ":framework-scheduling{.public.removed-api.txt}", ":framework-sdkextensions{.public.removed-api.txt}", ":framework-statsd{.public.removed-api.txt}", - ":framework-supplementalprocess{.public.removed-api.txt}", ":framework-tethering{.public.removed-api.txt}", ":framework-uwb{.public.removed-api.txt}", ":framework-wifi{.public.removed-api.txt}", @@ -240,7 +237,6 @@ genrule { ":framework-scheduling{.system.api.txt}", ":framework-sdkextensions{.system.api.txt}", ":framework-statsd{.system.api.txt}", - ":framework-supplementalprocess{.system.api.txt}", ":framework-tethering{.system.api.txt}", ":framework-uwb{.system.api.txt}", ":framework-wifi{.system.api.txt}", @@ -301,7 +297,6 @@ genrule { ":framework-scheduling{.system.removed-api.txt}", ":framework-sdkextensions{.system.removed-api.txt}", ":framework-statsd{.system.removed-api.txt}", - ":framework-supplementalprocess{.system.removed-api.txt}", ":framework-tethering{.system.removed-api.txt}", ":framework-uwb{.system.removed-api.txt}", ":framework-wifi{.system.removed-api.txt}", @@ -344,7 +339,6 @@ genrule { ":framework-scheduling{.module-lib.api.txt}", ":framework-sdkextensions{.module-lib.api.txt}", ":framework-statsd{.module-lib.api.txt}", - ":framework-supplementalprocess{.module-lib.api.txt}", ":framework-tethering{.module-lib.api.txt}", ":framework-uwb{.module-lib.api.txt}", ":framework-wifi{.module-lib.api.txt}", @@ -407,7 +401,6 @@ genrule { ":framework-scheduling{.module-lib.removed-api.txt}", ":framework-sdkextensions{.module-lib.removed-api.txt}", ":framework-statsd{.module-lib.removed-api.txt}", - ":framework-supplementalprocess{.module-lib.removed-api.txt}", ":framework-tethering{.module-lib.removed-api.txt}", ":framework-uwb{.module-lib.removed-api.txt}", ":framework-wifi{.module-lib.removed-api.txt}", @@ -528,7 +521,6 @@ genrule { ":framework-scheduling.stubs{.jar}", ":framework-sdkextensions.stubs{.jar}", ":framework-statsd.stubs{.jar}", - ":framework-supplementalprocess.stubs{.jar}", ":framework-tethering.stubs{.jar}", ":framework-uwb.stubs{.jar}", ":framework-wifi.stubs{.jar}", diff --git a/boot/Android.bp b/boot/Android.bp index 3273f2c6ed8ef..d88e839cc79d4 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -95,10 +95,6 @@ platform_bootclasspath { apex: "com.android.sdkext", module: "com.android.sdkext-bootclasspath-fragment", }, - { - apex: "com.android.supplementalprocess", - module: "com.android.supplementalprocess-bootclasspath-fragment", - }, { apex: "com.android.tethering", module: "com.android.tethering-bootclasspath-fragment",