diff options
| author | Aditya Choudhary <caditya@google.com> | 2024-01-31 13:35:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-31 13:35:58 +0000 |
| commit | 2a0234a268f709bf36ecdd94989e5382e56550cd (patch) | |
| tree | dc945dc867982ae6f4a93da497f8b158ed7b7348 | |
| parent | c4d01f5038c68014a4e447893b2eac8d7b9f578f (diff) | |
| parent | f7e2afb662a5eaca4f53adc100232597407743ba (diff) | |
| download | netd-2a0234a268f709bf36ecdd94989e5382e56550cd.tar.gz | |
[DON'T BLOCK] Test ownership migration rules am: f7e2afb662
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2936380
Change-Id: I530fd275ab8982d80f39d70965f383e32bcd3037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | client/Android.bp | 7 | ||||
| -rw-r--r-- | server/Android.bp | 4 | ||||
| -rw-r--r-- | tests/Android.bp | 13 | ||||
| -rw-r--r-- | tests/benchmarks/Android.bp | 1 |
4 files changed, 14 insertions, 11 deletions
diff --git a/client/Android.bp b/client/Android.bp index b893cc65..b072668e 100644 --- a/client/Android.bp +++ b/client/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "system_netd_license" @@ -71,13 +72,13 @@ cc_test { ], sanitize: { address: false, - recover: [ "all" ], + recover: ["all"], }, } cc_test { name: "netdclient_root_test", - require_root: true, // for ScopedUidChange + require_root: true, // for ScopedUidChange srcs: [ "NetdClientRootTest.cpp", ], @@ -96,6 +97,6 @@ cc_test { ], sanitize: { address: false, - recover: [ "all" ], + recover: ["all"], }, } diff --git a/server/Android.bp b/server/Android.bp index 882f0f0c..ff60ab0b 100644 --- a/server/Android.bp +++ b/server/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "system_netd_license" @@ -273,7 +274,7 @@ cc_defaults { "cken@google.com", ], triage_assignee: "waghpawan@google.com", - } + }, } cc_fuzz { @@ -297,4 +298,3 @@ cc_fuzz { "aidl-fuzzers/NetdNativeServiceFuzzer.cpp", ], } - diff --git a/tests/Android.bp b/tests/Android.bp index c86d38f4..a30aa14e 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "system_netd_license" @@ -26,7 +27,7 @@ cc_test_library { name: "libnetd_test_tun_interface", defaults: ["netd_defaults"], srcs: [ - "tun_interface.cpp" + "tun_interface.cpp", ], export_include_dirs: ["."], shared_libs: [ @@ -42,7 +43,7 @@ cc_test_library { "netd_defaults", ], srcs: [ - "TestUnsolService.cpp" + "TestUnsolService.cpp", ], include_dirs: [ "system/netd/include", @@ -61,7 +62,7 @@ cc_test_library { cc_test_library { name: "libnetd_test_utils", srcs: [ - "test_utils.cpp" + "test_utils.cpp", ], export_include_dirs: ["."], shared_libs: [ @@ -73,7 +74,7 @@ cc_test { name: "netd_integration_test", test_suites: [ "device-tests", - "vts" + "vts", ], isolated: false, require_root: true, @@ -81,7 +82,7 @@ cc_test { "netd_aidl_interface_lateststable_cpp_static", "netd_defaults", ], - tidy: false, // cuts test build time by almost 1 minute + tidy: false, // cuts test build time by almost 1 minute srcs: [ ":netd_integration_test_shared", "binder_test.cpp", @@ -128,6 +129,6 @@ cc_test { }, sanitize: { address: false, - recover: [ "all" ], + recover: ["all"], }, } diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp index 13c8105f..a7fc6a49 100644 --- a/tests/benchmarks/Android.bp +++ b/tests/benchmarks/Android.bp @@ -1,6 +1,7 @@ // APCT build target for metrics tests package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "system_netd_license" |