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

Commit 1067f3ee authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Rename supplementalprocess->sdksandbox jars" into tm-dev am: c04cf3c4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16997443

Change-Id: I3f40cbf0e0a1ed8599283dd89596d3fa63e87a80
parents 70dcd7c8 c04cf3c4

ApiDocs.bp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ stubs_defaults { 
        ":framework-scheduling-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-supplementalprocess-sources",

        ":framework-sdksandbox-sources",

        ":framework-tethering-srcs",

        ":framework-uwb-updatable-sources",

        ":framework-wifi-updatable-sources",

api/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ combined_apis { 
        "framework-scheduling",

        "framework-sdkextensions",

        "framework-statsd",

        "framework-supplementalprocess",

        "framework-sdksandbox",

        "framework-tethering",

        "framework-uwb",

        "framework-wifi",
@@ -136,7 +136,7 @@ combined_apis { 
    system_server_classpath: [

        "service-media-s",

        "service-permission",

        "service-supplementalprocess",

        "service-sdksandbox",

    ],

}

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ java_library_static { 
        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",

        "service-permission.stubs.system_server",

        "service-supplementalprocess.stubs.system_server",

        "service-sdksandbox.stubs.system_server",

    ],



    required: [

services/tests/mockingservicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ android_test { 
        "service-blobstore",

        "service-jobscheduler",

        "service-permission.impl",

        "service-supplementalprocess.impl",

        "service-sdksandbox.impl",

        "services.companion",

        "services.core",

        "services.devicepolicy",