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

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

Build tethering against the module SDK 

Link against the stubs of other modules and the implementation
of the tethering module jar.

Bug: 146757305
Test: m Tethering
Change-Id: I7c93b60654e21a4a27d21cbf0c2a6cb21f813529
Merged-In: I7c93b60654e21a4a27d21cbf0c2a6cb21f813529
(cherry picked from commit 383321e9)
parent 0d8b1cfa

packages/Tethering/Android.bp

+2 −18
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


java_defaults {

    name: "TetheringAndroidLibraryDefaults",

    // TODO (b/146757305): change to module API once available

    // TODO (b/148190005): change to module-libs-api-stubs-current once it is ready.

    sdk_version: "core_platform",

    sdk_version: "module_current",

    srcs: [

        "src/**/*.java",

        ":framework-tethering-shared-srcs",
@@ -35,15 +33,8 @@ java_defaults { 
        "net-utils-framework-common",

    ],

    libs: [

        // Order matters: framework-tethering needs to be before the system stubs, otherwise

        // hidden fields in the framework-tethering classes (which are also used to generate stubs)

        // will not be found.

        "framework-tethering",

        "android_system_stubs_current",

        "framework-res",

        "unsupportedappusage",

        "android_system_stubs_current",

        "framework-res",

    ],

    plugins: ["java_api_finder"],

    manifest: "AndroidManifestBase.xml",
@@ -91,9 +82,7 @@ cc_library { 
// Common defaults for compiling the actual APK.

java_defaults {

    name: "TetheringAppDefaults",

    // TODO (b/146757305): change to module API once available

    // TODO (b/148190005): change to module-libs-api-stubs-current once it is ready.

    sdk_version: "core_platform",

    sdk_version: "module_current",

    privileged: true,

    jni_libs: [

        "libtetherutilsjni",
@@ -102,12 +91,7 @@ java_defaults { 
        "res",

    ],

    libs: [

        // Order matters: framework-tethering needs to be before the system stubs, otherwise

        // hidden fields in the framework-tethering classes (which are also used to generate stubs)

        // will not be found.

        "framework-tethering",

        "android_system_stubs_current",

        "framework-res",

    ],

    jarjar_rules: "jarjar-rules.txt",

    optimize: {