Skip to content
Snippets Groups Projects
Commit 8182d8bd authored by Jooyung Han's avatar Jooyung Han
Browse files

Set min_sdk_version for updatable mainline modules

Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 145796956
Bug: 150999716
Test: m
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
parent 0e337146
No related branches found
No related tags found
No related merge requests found
...@@ -50,6 +50,11 @@ android_library { ...@@ -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 { ...@@ -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 @@ ...@@ -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 { ...@@ -37,6 +37,12 @@ aidl_interface {
cpp: { cpp: {
enabled: false, enabled: false,
}, },
java: {
apex_available: [
"//apex_available:platform",
"com.android.tethering",
],
},
}, },
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment