Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bddffaa4 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

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
parent 1ed8ac99

Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -154,7 +154,6 @@ java_library { 
        "framework-scheduling.stubs.module_lib",

        "framework-scheduling.stubs.module_lib",

        "framework-sdkextensions.stubs.module_lib",

        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-supplementalprocess.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "framework-uwb.stubs.module_lib",

        "framework-uwb.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

        "framework-wifi.stubs.module_lib",
@@ -178,7 +177,6 @@ java_library { 
        "framework-scheduling.impl",

        "framework-scheduling.impl",

        "framework-sdkextensions.impl",

        "framework-sdkextensions.impl",

        "framework-statsd.impl",

        "framework-statsd.impl",

        "framework-supplementalprocess.impl",

        "framework-tethering.impl",

        "framework-tethering.impl",

        "framework-uwb.impl",

        "framework-uwb.impl",

        "framework-wifi.impl",

        "framework-wifi.impl",

ApiDocs.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -126,7 +126,6 @@ stubs_defaults { 
        ":framework-scheduling-sources",

        ":framework-scheduling-sources",

        ":framework-sdkextensions-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-statsd-sources",

        ":framework-supplementalprocess-sources",

        ":framework-tethering-srcs",

        ":framework-tethering-srcs",

        ":framework-uwb-updatable-sources",

        ":framework-uwb-updatable-sources",

        ":framework-wifi-updatable-sources",

        ":framework-wifi-updatable-sources",
@@ -173,7 +172,6 @@ droidstubs { 
        ":framework-scheduling{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-supplementalprocess{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-uwb{.public.stubs.source}",

        ":framework-uwb{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",
@@ -213,7 +211,6 @@ genrule { 
        ":framework-scheduling{.public.annotations.zip}",

        ":framework-scheduling{.public.annotations.zip}",

        ":framework-sdkextensions{.public.annotations.zip}",

        ":framework-sdkextensions{.public.annotations.zip}",

        ":framework-statsd{.public.annotations.zip}",

        ":framework-statsd{.public.annotations.zip}",

        ":framework-supplementalprocess{.public.annotations.zip}",

        ":framework-tethering{.public.annotations.zip}",

        ":framework-tethering{.public.annotations.zip}",

        ":framework-uwb{.public.annotations.zip}",

        ":framework-uwb{.public.annotations.zip}",

        ":framework-wifi{.public.annotations.zip}",

        ":framework-wifi{.public.annotations.zip}",

StubLibraries.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -250,7 +250,6 @@ modules_public_stubs = [ 
    "framework-scheduling.stubs",

    "framework-scheduling.stubs",

    "framework-sdkextensions.stubs",

    "framework-sdkextensions.stubs",

    "framework-statsd.stubs",

    "framework-statsd.stubs",

    "framework-supplementalprocess.stubs",

    "framework-tethering.stubs",

    "framework-tethering.stubs",

    "framework-uwb.stubs",

    "framework-uwb.stubs",

    "framework-wifi.stubs",

    "framework-wifi.stubs",
@@ -272,7 +271,6 @@ modules_system_stubs = [ 
    "framework-scheduling.stubs.system",

    "framework-scheduling.stubs.system",

    "framework-sdkextensions.stubs.system",

    "framework-sdkextensions.stubs.system",

    "framework-statsd.stubs.system",

    "framework-statsd.stubs.system",

    "framework-supplementalprocess.stubs",

    "framework-tethering.stubs.system",

    "framework-tethering.stubs.system",

    "framework-uwb.stubs.system",

    "framework-uwb.stubs.system",

    "framework-wifi.stubs.system",

    "framework-wifi.stubs.system",

api/Android.bp

+0 −8
Original line number Original line Diff line number Diff line
@@ -106,7 +106,6 @@ genrule { 
        ":framework-scheduling{.public.api.txt}",

        ":framework-scheduling{.public.api.txt}",

        ":framework-sdkextensions{.public.api.txt}",

        ":framework-sdkextensions{.public.api.txt}",

        ":framework-statsd{.public.api.txt}",

        ":framework-statsd{.public.api.txt}",

        ":framework-supplementalprocess{.public.api.txt}",

        ":framework-tethering{.public.api.txt}",

        ":framework-tethering{.public.api.txt}",

        ":framework-uwb{.public.api.txt}",

        ":framework-uwb{.public.api.txt}",

        ":framework-wifi{.public.api.txt}",

        ":framework-wifi{.public.api.txt}",
@@ -168,7 +167,6 @@ genrule { 
        ":framework-scheduling{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-supplementalprocess{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-uwb{.public.stubs.source}",

        ":framework-uwb{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",
@@ -197,7 +195,6 @@ genrule { 
        ":framework-scheduling{.public.removed-api.txt}",

        ":framework-scheduling{.public.removed-api.txt}",

        ":framework-sdkextensions{.public.removed-api.txt}",

        ":framework-sdkextensions{.public.removed-api.txt}",

        ":framework-statsd{.public.removed-api.txt}",

        ":framework-statsd{.public.removed-api.txt}",

        ":framework-supplementalprocess{.public.removed-api.txt}",

        ":framework-tethering{.public.removed-api.txt}",

        ":framework-tethering{.public.removed-api.txt}",

        ":framework-uwb{.public.removed-api.txt}",

        ":framework-uwb{.public.removed-api.txt}",

        ":framework-wifi{.public.removed-api.txt}",

        ":framework-wifi{.public.removed-api.txt}",
@@ -240,7 +237,6 @@ genrule { 
        ":framework-scheduling{.system.api.txt}",

        ":framework-scheduling{.system.api.txt}",

        ":framework-sdkextensions{.system.api.txt}",

        ":framework-sdkextensions{.system.api.txt}",

        ":framework-statsd{.system.api.txt}",

        ":framework-statsd{.system.api.txt}",

        ":framework-supplementalprocess{.system.api.txt}",

        ":framework-tethering{.system.api.txt}",

        ":framework-tethering{.system.api.txt}",

        ":framework-uwb{.system.api.txt}",

        ":framework-uwb{.system.api.txt}",

        ":framework-wifi{.system.api.txt}",

        ":framework-wifi{.system.api.txt}",
@@ -301,7 +297,6 @@ genrule { 
        ":framework-scheduling{.system.removed-api.txt}",

        ":framework-scheduling{.system.removed-api.txt}",

        ":framework-sdkextensions{.system.removed-api.txt}",

        ":framework-sdkextensions{.system.removed-api.txt}",

        ":framework-statsd{.system.removed-api.txt}",

        ":framework-statsd{.system.removed-api.txt}",

        ":framework-supplementalprocess{.system.removed-api.txt}",

        ":framework-tethering{.system.removed-api.txt}",

        ":framework-tethering{.system.removed-api.txt}",

        ":framework-uwb{.system.removed-api.txt}",

        ":framework-uwb{.system.removed-api.txt}",

        ":framework-wifi{.system.removed-api.txt}",

        ":framework-wifi{.system.removed-api.txt}",
@@ -344,7 +339,6 @@ genrule { 
        ":framework-scheduling{.module-lib.api.txt}",

        ":framework-scheduling{.module-lib.api.txt}",

        ":framework-sdkextensions{.module-lib.api.txt}",

        ":framework-sdkextensions{.module-lib.api.txt}",

        ":framework-statsd{.module-lib.api.txt}",

        ":framework-statsd{.module-lib.api.txt}",

        ":framework-supplementalprocess{.module-lib.api.txt}",

        ":framework-tethering{.module-lib.api.txt}",

        ":framework-tethering{.module-lib.api.txt}",

        ":framework-uwb{.module-lib.api.txt}",

        ":framework-uwb{.module-lib.api.txt}",

        ":framework-wifi{.module-lib.api.txt}",

        ":framework-wifi{.module-lib.api.txt}",
@@ -407,7 +401,6 @@ genrule { 
        ":framework-scheduling{.module-lib.removed-api.txt}",

        ":framework-scheduling{.module-lib.removed-api.txt}",

        ":framework-sdkextensions{.module-lib.removed-api.txt}",

        ":framework-sdkextensions{.module-lib.removed-api.txt}",

        ":framework-statsd{.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-tethering{.module-lib.removed-api.txt}",

        ":framework-uwb{.module-lib.removed-api.txt}",

        ":framework-uwb{.module-lib.removed-api.txt}",

        ":framework-wifi{.module-lib.removed-api.txt}",

        ":framework-wifi{.module-lib.removed-api.txt}",
@@ -528,7 +521,6 @@ genrule { 
        ":framework-scheduling.stubs{.jar}",

        ":framework-scheduling.stubs{.jar}",

        ":framework-sdkextensions.stubs{.jar}",

        ":framework-sdkextensions.stubs{.jar}",

        ":framework-statsd.stubs{.jar}",

        ":framework-statsd.stubs{.jar}",

        ":framework-supplementalprocess.stubs{.jar}",

        ":framework-tethering.stubs{.jar}",

        ":framework-tethering.stubs{.jar}",

        ":framework-uwb.stubs{.jar}",

        ":framework-uwb.stubs{.jar}",

        ":framework-wifi.stubs{.jar}",

        ":framework-wifi.stubs{.jar}",

boot/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -95,10 +95,6 @@ platform_bootclasspath { 
            apex: "com.android.sdkext",

            apex: "com.android.sdkext",

            module: "com.android.sdkext-bootclasspath-fragment",

            module: "com.android.sdkext-bootclasspath-fragment",

        },

        },

        {

            apex: "com.android.supplementalprocess",

            module: "com.android.supplementalprocess-bootclasspath-fragment",

        },

        {

        {

            apex: "com.android.tethering",

            apex: "com.android.tethering",

            module: "com.android.tethering-bootclasspath-fragment",

            module: "com.android.tethering-bootclasspath-fragment",