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

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

Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..." 

Revert "Revert "Add framework-supplementalprocess to PRODUCT_APE..."

Revert^2 "Add framework-supplementalprocess prebuilts"

e0c2a4dea0d0e27abad0cd3e4d440ab8f82752e4

Change-Id: I98366465906bb6b78ecf75a9a2319f64feb25beb
parent bddffaa4

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 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",
@@ -177,6 +178,7 @@ java_library { 
        "framework-scheduling.impl",

        "framework-sdkextensions.impl",

        "framework-statsd.impl",

        "framework-supplementalprocess.impl",

        "framework-tethering.impl",

        "framework-uwb.impl",

        "framework-wifi.impl",

ApiDocs.bp

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ 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",
@@ -172,6 +173,7 @@ 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}",
@@ -211,6 +213,7 @@ 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}",

StubLibraries.bp

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

    "framework-sdkextensions.stubs",

    "framework-statsd.stubs",

    "framework-supplementalprocess.stubs",

    "framework-tethering.stubs",

    "framework-uwb.stubs",

    "framework-wifi.stubs",
@@ -271,6 +272,7 @@ 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",

api/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 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}",
@@ -167,6 +168,7 @@ 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}",
@@ -195,6 +197,7 @@ 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}",
@@ -237,6 +240,7 @@ 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}",
@@ -297,6 +301,7 @@ 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}",
@@ -339,6 +344,7 @@ 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}",
@@ -401,6 +407,7 @@ 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}",
@@ -521,6 +528,7 @@ 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}",

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ 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",