Make CaptivePortalLogin module build against module_current SDK.
To use DeviceConfigUtils#isFeatureEnabled in CaptivePortalLogin module,
that library is built against module API, therefore, adjust sdk_version
property to module_current to make Android.bp build work.
However, it also introduces other framework connectivity, wifi and
MediaStore dependencies, add the relevant libs to make build work.
Bug: 329361366
Test: TH
Change-Id: Ia1d3904eca7c5338f2230e13349812738f2a1c69
diff --git a/Android.bp b/Android.bp
index 6271a14..c8e2020 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,14 +22,20 @@
java_defaults {
name: "CaptivePortalLoginDefaults",
srcs: ["src/**/*.java"],
- sdk_version: "system_current",
+ sdk_version: "module_current",
min_sdk_version: "30",
target_sdk_version: "34", // Keep in sync with CaptivePortalLoginTests
static_libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-core-ui",
- "metrics-constants-protos",
"captiveportal-lib",
+ "metrics-constants-protos",
+ "net-utils-device-common",
+ ],
+ libs: [
+ "framework-connectivity",
+ "framework-mediaprovider",
+ "framework-wifi",
],
manifest: "AndroidManifest.xml",
lint: {
