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

Commit a89c6163 authored by Jooyung Han's avatar Jooyung Han Committed by Android (Google) Code Review
Browse files

Merge changes I655211e0,Ifaecb49a into rvc-dev 

* changes:
  InProcessTethering: set min_sdk_version
  Set min_sdk_version for updatable mainline modules
parents a56a11b8 292dff5f

packages/Tethering/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ android_library { 
cc_library {

    name: "libtetherutilsjni",

    sdk_version: "current",

    apex_available: [

        "//apex_available:platform", // Used by InProcessTethering

        "com.android.tethering",

    ],

    min_sdk_version: "current",

    srcs: [

        "jni/android_net_util_TetheringUtils.cpp",

    ],
@@ -110,6 +115,7 @@ android_app { 
    // InProcessTethering is a replacement for Tethering

    overrides: ["Tethering"],

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

    min_sdk_version: "current",

}



// Updatable tethering packaged as an application
@@ -123,4 +129,5 @@ android_app { 
    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

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

    min_sdk_version: "current",

}

packages/Tethering/apex/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
apex {

    name: "com.android.tethering",

    updatable: true,

    min_sdk_version: "R",

    min_sdk_version: "current",

    java_libs: ["framework-tethering"],

    apps: ["Tethering"],

    manifest: "manifest.json",

packages/Tethering/common/TetheringLib/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        java: {

            apex_available: [

                "//apex_available:platform",

                "com.android.tethering",

            ],

        },

    },

}