Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299
Change-Id: I30b90b19967d2a4cd8e283420f856816c3e4bbb4
This commit is contained in:
@@ -50,6 +50,11 @@ android_library {
|
|||||||
cc_library {
|
cc_library {
|
||||||
name: "libtetherutilsjni",
|
name: "libtetherutilsjni",
|
||||||
sdk_version: "current",
|
sdk_version: "current",
|
||||||
|
apex_available: [
|
||||||
|
"//apex_available:platform", // Used by InProcessTethering
|
||||||
|
"com.android.tethering",
|
||||||
|
],
|
||||||
|
min_sdk_version: "current",
|
||||||
srcs: [
|
srcs: [
|
||||||
"jni/android_net_util_TetheringUtils.cpp",
|
"jni/android_net_util_TetheringUtils.cpp",
|
||||||
],
|
],
|
||||||
@@ -121,4 +126,5 @@ android_app {
|
|||||||
// The permission configuration *must* be included to ensure security of the device
|
// The permission configuration *must* be included to ensure security of the device
|
||||||
required: ["NetworkPermissionConfig"],
|
required: ["NetworkPermissionConfig"],
|
||||||
apex_available: ["com.android.tethering"],
|
apex_available: ["com.android.tethering"],
|
||||||
|
min_sdk_version: "current",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
apex {
|
apex {
|
||||||
name: "com.android.tethering",
|
name: "com.android.tethering",
|
||||||
updatable: true,
|
updatable: true,
|
||||||
min_sdk_version: "R",
|
min_sdk_version: "current",
|
||||||
java_libs: ["framework-tethering"],
|
java_libs: ["framework-tethering"],
|
||||||
apps: ["Tethering"],
|
apps: ["Tethering"],
|
||||||
manifest: "manifest.json",
|
manifest: "manifest.json",
|
||||||
|
|||||||
@@ -37,6 +37,12 @@ aidl_interface {
|
|||||||
cpp: {
|
cpp: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
|
java: {
|
||||||
|
apex_available: [
|
||||||
|
"//apex_available:platform",
|
||||||
|
"com.android.tethering",
|
||||||
|
],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user