[DON'T BLOCK] Test ownership migration rules am: a8e736dde9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2950647
Change-Id: I8d24a63ffa32318a2a6aae60e9372708b6673149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 0925b9e..6271a14 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_core_networking",
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -31,7 +32,9 @@
"captiveportal-lib",
],
manifest: "AndroidManifest.xml",
- lint: { strict_updatability_linting: true },
+ lint: {
+ strict_updatability_linting: true,
+ },
optimize: {
ignore_warnings: false,
},
@@ -48,7 +51,9 @@
name: "CaptivePortalLoginTestLib",
defaults: ["CaptivePortalLoginDefaults"],
static_libs: ["net-tests-utils"],
- lint: { strict_updatability_linting: true }
+ lint: {
+ strict_updatability_linting: true,
+ },
}
// Alternative CaptivePortalLogin signed with the platform cert, to use
@@ -58,5 +63,7 @@
defaults: ["CaptivePortalLoginDefaults"],
certificate: "platform",
overrides: ["CaptivePortalLogin"],
- lint: { strict_updatability_linting: true }
+ lint: {
+ strict_updatability_linting: true,
+ },
}
diff --git a/tests/Android.bp b/tests/Android.bp
index 179c65f..c77e8af 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_core_networking",
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -23,12 +24,18 @@
defaults: [
"framework-connectivity-test-defaults",
],
- srcs: ["src/**/*.java", "src/**/*.kt"],
+ srcs: [
+ "src/**/*.java",
+ "src/**/*.kt",
+ ],
platform_apis: true,
compile_multilib: "both",
min_sdk_version: "30",
target_sdk_version: "34", // Keep in sync with CaptivePortalLogin
- test_suites: ["general-tests", "mts-networking"],
+ test_suites: [
+ "general-tests",
+ "mts-networking",
+ ],
test_config: "AndroidTest.xml",
static_libs: [
