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

Commit fe8b0458 authored by Anton Hansson's avatar Anton Hansson
Browse files

Create all variants of stubs for tethering 

Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
parent 15273536

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ java_library { 
        "framework-statsd-stubs-module_libs_api",

        "framework-permission-stubs-systemapi",

        "framework-wifi-stubs-systemapi",

        "framework-tethering-stubs",

        "framework-tethering-stubs-module_libs_api",

    ],

    installable: true,

    javac_shard_size: 150,
@@ -518,7 +518,7 @@ java_library { 
        "framework-sdkextensions-stubs-systemapi",

        "framework-statsd-stubs-module_libs_api",

        "framework-wifi-stubs-systemapi",

        "framework-tethering-stubs",

        "framework-tethering-stubs-module_libs_api",

        // TODO (b/147688669) should be framework-telephony-stubs

        "framework-telephony",

        // TODO(jiyong): add stubs for APEXes here
@@ -540,7 +540,6 @@ java_library { 
    visibility: [

        // DO NOT ADD ANY MORE ENTRIES TO THIS LIST

        "//external/robolectric-shadows:__subpackages__",

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

        "//frameworks/layoutlib:__subpackages__",

        "//frameworks/opt/net/ike:__subpackages__",

    ],

packages/Tethering/common/TetheringLib/Android.bp

+53 −15
Original line number Diff line number Diff line
@@ -62,26 +62,14 @@ java_library { 
    apex_available: ["com.android.tethering"],

}



droidstubs {

    name: "framework-tethering-stubs-sources",

    defaults: ["framework-module-stubs-defaults-module_libs_api"],

stubs_defaults {

    name: "framework-tethering-stubs-defaults",

    srcs: [

        "src/android/net/TetheredClient.java",

        "src/android/net/TetheringManager.java",

        "src/android/net/TetheringConstants.java",

    ],

    libs: [

        "tethering-aidl-interfaces-java",

        "framework-all",

    ],

    sdk_version: "core_platform",

}



java_library {

    name: "framework-tethering-stubs",

    srcs: [":framework-tethering-stubs-sources"],

    libs: ["framework-all"],

    sdk_version: "core_platform",

    libs: ["tethering-aidl-interfaces-java"],

}



filegroup {
@@ -101,3 +89,53 @@ filegroup { 
    ],

    path: "src"

}



droidstubs {

    name: "framework-tethering-stubs-srcs-publicapi",

    defaults: [

        "framework-module-stubs-defaults-publicapi",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-stubs-srcs-systemapi",

    defaults: [

        "framework-module-stubs-defaults-systemapi",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-api-module_libs_api",

    defaults: [

        "framework-module-api-defaults-module_libs_api",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-stubs-srcs-module_libs_api",

    defaults: [

        "framework-module-stubs-defaults-module_libs_api",

        "framework-tethering-stubs-defaults",

    ],

}



java_library {

    name: "framework-tethering-stubs-publicapi",

    srcs: [":framework-tethering-stubs-srcs-publicapi"],

    sdk_version: "current",

}



java_library {

    name: "framework-tethering-stubs-systemapi",

    srcs: [":framework-tethering-stubs-srcs-systemapi"],

    sdk_version: "system_current",

}



java_library {

    name: "framework-tethering-stubs-module_libs_api",

    srcs: [":framework-tethering-stubs-srcs-module_libs_api"],

    sdk_version: "module_current",

}

services/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ java_library { 


    libs: [

        "android.hidl.manager-V1.0-java",

        "framework-tethering-stubs",

        "framework-tethering-stubs-module_libs_api",

    ],



    plugins: [

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ java_library_static { 
        "android.hardware.tv.cec-V1.0-java",

        "android.hardware.vibrator-java",

        "app-compat-annotations",

        "framework-tethering-stubs",

        "framework-tethering-stubs-module_libs_api",

        "ike-stubs",

    ],