Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e am: 669772eb76

Change-Id: I57ab89f20d066fe68110e1391032ae56c40b4ac0
This commit is contained in:
Jooyung Han
2020-05-08 09:56:45 +00:00
committed by Automerger Merge Worker
3 changed files with 13 additions and 1 deletions

View File

@@ -51,6 +51,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",
], ],
@@ -123,4 +128,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",
} }

View File

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

View File

@@ -37,6 +37,12 @@ aidl_interface {
cpp: { cpp: {
enabled: false, enabled: false,
}, },
java: {
apex_available: [
"//apex_available:platform",
"com.android.tethering",
],
},
}, },
} }