framework-wifi & OsuLogin: set min & target SDK version to 30
Bug: 158681189
Test: device boots up and connects to wifi
Test: connect to OSU network
Change-Id: I751bd3b7a89a7b3dab6a68e1b030651fbb801481
diff --git a/OsuLogin/Android.bp b/OsuLogin/Android.bp
index d7e36b1..445c81b 100644
--- a/OsuLogin/Android.bp
+++ b/OsuLogin/Android.bp
@@ -1,5 +1,6 @@
android_app {
name: "OsuLogin",
+ defaults: ["wifi-module-sdk-version-defaults"],
static_libs: ["androidx.legacy_legacy-support-v4"],
resource_dirs: ["res"],
srcs: ["src/**/*.java"],
diff --git a/framework/Android.bp b/framework/Android.bp
index 9c5b7b6..941ff61 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -12,6 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+java_defaults {
+ name: "wifi-module-sdk-version-defaults",
+ min_sdk_version: "30",
+ target_sdk_version: "30",
+}
+
filegroup {
name: "framework-wifi-updatable-exported-aidl-sources",
srcs: ["aidl-export/**/*.aidl"],
@@ -73,6 +79,7 @@
// classes before they are renamed.
java_library {
name: "framework-wifi-pre-jarjar",
+ defaults: ["wifi-module-sdk-version-defaults"],
sdk_version: "module_current",
static_libs: [
"framework-wifi-util-lib",
@@ -98,7 +105,10 @@
// post-jarjar version of framework-wifi
java_sdk_library {
name: "framework-wifi",
- defaults: ["framework-module-defaults"],
+ defaults: [
+ "framework-module-defaults",
+ "wifi-module-sdk-version-defaults",
+ ],
static_libs: [
"framework-wifi-util-lib",
"android.hardware.wifi-V1.0-java-constants",
