Merge "Migrate Test Targets to New Android Ownership Model" into main
diff --git a/net/netd/1.0/vts/functional/Android.bp b/net/netd/1.0/vts/functional/Android.bp
index 5e11a27..b175644 100644
--- a/net/netd/1.0/vts/functional/Android.bp
+++ b/net/netd/1.0/vts/functional/Android.bp
@@ -14,6 +14,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_fwk_core_networking",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/net/netd/1.1/vts/functional/Android.bp b/net/netd/1.1/vts/functional/Android.bp
index 11a2865..e89b373 100644
--- a/net/netd/1.1/vts/functional/Android.bp
+++ b/net/netd/1.1/vts/functional/Android.bp
@@ -14,6 +14,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_cloud_android",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/net/netd/aidl/vts/Android.bp b/net/netd/aidl/vts/Android.bp
index 2d5bdb2..eed2fc9 100644
--- a/net/netd/aidl/vts/Android.bp
+++ b/net/netd/aidl/vts/Android.bp
@@ -14,6 +14,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_fwk_core_networking",
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -22,8 +23,10 @@
srcs: [
"VtsHalNetNetdV1TargetTest.cpp",
],
- defaults: ["VtsHalNetNetdTestDefaults",
- "use_libaidlvintf_gtest_helper_static",],
+ defaults: [
+ "VtsHalNetNetdTestDefaults",
+ "use_libaidlvintf_gtest_helper_static",
+ ],
static_libs: [
"android.system.net.netd-V1-ndk",
"libnetd_test_tun_interface",
diff --git a/wifi/keystore/1.0/default/test/Android.bp b/wifi/keystore/1.0/default/test/Android.bp
index 3d874ea..23e7772 100644
--- a/wifi/keystore/1.0/default/test/Android.bp
+++ b/wifi/keystore/1.0/default/test/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_wifi_hal",
default_applicable_licenses: ["Android-Apache-2.0"],
}