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
Merged-In: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
(cherry picked from commit 33aa294e96f13906f596e427b96652fe80cf199b)
This commit is contained in:
Jooyung Han
2020-04-29 02:43:30 +09:00
parent dc3b82db70
commit 5f9f31c18b
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",
],
},
}, },
} }