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

Commit 918344d4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Platform shouldn't directly link to jars in APEXes" am: 510d7bf4 am: 0902172e 

Change-Id: Ibd1567142b4cc77e9b3214ab9c3445650ffe69e8
parents 5f8f08ef 0902172e

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ java_library { 
        "framework-minus-apex",

        "updatable_media_stubs",

        "framework-sdkextensions-stubs-systemapi",

        // TODO(jiyong): add more stubs for APEXes here

        // TODO(b/147200698): should be the stub of framework-tethering

        "framework-tethering",

    ],

    sdk_version: "core_platform",

    apex_available: ["//apex_available:platform"],

apex/sdkextensions/framework/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ java_library { 
        "//frameworks/base/apex/sdkextensions",

        "//frameworks/base/apex/sdkextensions/testing",

    ],

    hostdex: true, // for hiddenapi check

    apex_available: [

        "com.android.sdkext",

        "test_com.android.sdkext",

    ],

}



droidstubs {

packages/Tethering/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -122,4 +122,5 @@ android_app { 
    use_embedded_native_libs: true,

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

    apex_available: ["com.android.tethering"],

}

packages/Tethering/common/TetheringLib/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -47,6 +47,16 @@ java_library { 
    libs: [

        "android_system_stubs_current",

    ],



    hostdex: true, // for hiddenapi check

    visibility: [

        "//frameworks/base/packages/Tethering:__subpackages__",

        //TODO(b/147200698) remove below lines when the platform is built with stubs

        "//frameworks/base",

        "//frameworks/base/services",

        "//frameworks/base/services/core",

    ],

    apex_available: ["com.android.tethering"],

}



filegroup {