summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-08 01:28:50 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-08 01:28:50 +0000
commit46c814e0691fd7e7e1ea6b8dea279e81c9b5c79c (patch)
treee1996198f841d5684f280c8db03cf4c5e7091476
parent24ebd55d6b1bfef00afebb80c5708147d014a664 (diff)
parenta8e736dde91236b145a2aaa482dd79f1663f8de4 (diff)
downloadCaptivePortalLogin-simpleperf-release.tar.gz
Snap for 11421525 from a8e736dde91236b145a2aaa482dd79f1663f8de4 to simpleperf-releasesimpleperf-release
Change-Id: I6e4731e4d4b52b505742b579a2de1da899cda51b
-rw-r--r--Android.bp13
-rw-r--r--tests/Android.bp11
2 files changed, 19 insertions, 5 deletions
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 @@ java_defaults {
"captiveportal-lib",
],
manifest: "AndroidManifest.xml",
- lint: { strict_updatability_linting: true },
+ lint: {
+ strict_updatability_linting: true,
+ },
optimize: {
ignore_warnings: false,
},
@@ -48,7 +51,9 @@ android_library {
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 @@ android_app {
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 @@ android_test {
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: [