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

Commit 2e8721fe authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Build tethering against the module SDK" into rvc-dev am: 8f36aba1 

Change-Id: I4871c7527b859e8da5090002a0f031cf0315aed9
parents 3785a0cf 8f36aba1

packages/Tethering/Android.bp

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




java_defaults {

java_defaults {

    name: "TetheringAndroidLibraryDefaults",

    name: "TetheringAndroidLibraryDefaults",

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

    sdk_version: "module_current",

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

    sdk_version: "core_platform",

    srcs: [

    srcs: [

        "src/**/*.java",

        "src/**/*.java",

        ":framework-tethering-shared-srcs",

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

        "net-utils-framework-common",

    ],

    ],

    libs: [

    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",

        "framework-tethering",

        "android_system_stubs_current",

        "framework-telephony-stubs",

        "framework-res",

        "framework-wifi-stubs-systemapi",

        "unsupportedappusage",

        "unsupportedappusage",

        "android_system_stubs_current",

        "framework-res",

    ],

    ],

    plugins: ["java_api_finder"],

    plugins: ["java_api_finder"],

    manifest: "AndroidManifestBase.xml",

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

// Common defaults for compiling the actual APK.

java_defaults {

java_defaults {

    name: "TetheringAppDefaults",

    name: "TetheringAppDefaults",

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

    sdk_version: "module_current",

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

    sdk_version: "core_platform",

    privileged: true,

    privileged: true,

    jni_libs: [

    jni_libs: [

        "libtetherutilsjni",

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

        "res",

    ],

    ],

    libs: [

    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",

        "framework-tethering",

        "android_system_stubs_current",

        "framework-res",

    ],

    ],

    jarjar_rules: "jarjar-rules.txt",

    jarjar_rules: "jarjar-rules.txt",

    optimize: {

    optimize: {