Snap for 11406128 from 2ca97ef7eb3ba43828f8261503d6494c6c28caa3 to sdk-release

Change-Id: Ibb0c1a979711b26290cda044d1e44f4c935a8372

7 files changed, 60 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index f0fd5c63..fa4bb0c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
     default_applicable_licenses: ["packages_modules_DnsResolver_license"],
 }
 
diff --git a/apex/Android.bp b/apex/Android.bp
index 41fb4475..82302dd1 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // 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 "packages_modules_DnsResolver_license"
@@ -27,7 +27,7 @@ apex {
     manifest: "manifest.json",
     multilib: {
         first: {
-             native_shared_libs: ["libnetd_resolv"],
+            native_shared_libs: ["libnetd_resolv"],
         },
     },
     key: "com.android.resolv.key",
@@ -56,7 +56,7 @@ apex_key {
 }
 
 android_app_certificate {
-     name: "com.android.resolv.certificate",
-     // will use cert.pk8 and cert.x509.pem
-     certificate: "testcert",
+    name: "com.android.resolv.certificate",
+    // will use cert.pk8 and cert.x509.pem
+    certificate: "testcert",
 }
diff --git a/doh/tests/doh_frontend/Android.bp b/doh/tests/doh_frontend/Android.bp
index e4db22ef..156fb5cc 100644
--- a/doh/tests/doh_frontend/Android.bp
+++ b/doh/tests/doh_frontend/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 "packages_modules_DnsResolver_license"
diff --git a/tests/Android.bp b/tests/Android.bp
index d18deaab..7f10d378 100644
--- a/tests/Android.bp
+++ b/tests/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 "packages_modules_DnsResolver_license"
@@ -9,7 +10,10 @@ package {
 
 cc_test_library {
     name: "libnetd_test_resolv_utils",
-    defaults: ["netd_defaults", "resolv_test_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+    ],
     srcs: [
         "resolv_test_utils.cpp",
     ],
@@ -64,9 +68,9 @@ genrule {
     srcs: ["testdata/*.pbtxt"],
     // convert .pbtxt to .pb files; zip them as a single pb.zip.
     cmd: "mkdir $(genDir)/pb && for fname in $(in); " +
-         "do $(location resolv_gold_test_pbtxt2pb_host) --in_file=$$fname " +
-         "--out_dir=$(genDir)/pb; done && " +
-         "$(location soong_zip) -o $(out) -C $(genDir)/pb -D $(genDir)/pb",
+        "do $(location resolv_gold_test_pbtxt2pb_host) --in_file=$$fname " +
+        "--out_dir=$(genDir)/pb; done && " +
+        "$(location soong_zip) -o $(out) -C $(genDir)/pb -D $(genDir)/pb",
     out: ["testdata/pb.zip"],
 }
 
@@ -85,14 +89,20 @@ cc_library_static {
 
 cc_test {
     name: "resolv_gold_test",
-    test_suites: ["general-tests", "mts-dnsresolver"],
+    test_suites: [
+        "general-tests",
+        "mts-dnsresolver",
+    ],
     isolated: false,
     require_root: true,
     // b/151392634, this is a workaround because MTS
     // can not handle the test with testdata correctly.
     // TODO: Remove the xml after MTS fixing the problem.
     test_config: "resolv_gold_test_config.xml",
-    defaults: ["netd_defaults", "resolv_test_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+    ],
     data: [":resolv_gold_test_pbtxt2pb"],
     srcs: [
         "resolv_gold_test.cpp",
@@ -136,12 +146,19 @@ cc_test {
 
 cc_test {
     name: "resolv_stress_test",
-    test_suites: ["general-tests", "mts-dnsresolver"],
+    test_suites: [
+        "general-tests",
+        "mts-dnsresolver",
+    ],
     isolated: false,
     // This won't work with test_config
     // require_root: true,
     // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.
-    defaults: ["netd_defaults", "resolv_test_defaults", "resolv_test_mts_coverage_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+        "resolv_test_mts_coverage_defaults",
+    ],
     srcs: [
         "resolv_stress_test.cpp",
     ],
@@ -165,11 +182,17 @@ cc_test {
 
 cc_test {
     name: "resolv_integration_test",
-    test_suites: ["general-tests", "mts-dnsresolver"],
+    test_suites: [
+        "general-tests",
+        "mts-dnsresolver",
+    ],
     isolated: false,
     require_root: true,
     test_config_template: ":resolv_test_config_template",
-    defaults: ["netd_defaults", "resolv_test_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+    ],
     tidy: false, // cuts test build time by > 1m30s
     srcs: [
         "dns_responder/dns_responder.cpp",
@@ -228,7 +251,7 @@ cc_test {
     // after the build process.
     host_required: [
         "net-tests-utils-host-common",
-    ]
+    ],
 }
 
 cc_test {
@@ -283,9 +306,12 @@ cc_test {
 cc_test_library {
     name: "resolv_stats_test_utils",
     srcs: [
-        "resolv_stats_test_utils.cpp"
+        "resolv_stats_test_utils.cpp",
+    ],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
     ],
-    defaults: ["netd_defaults", "resolv_test_defaults"],
     export_include_dirs: ["."],
     static_libs: [
         "libgmock",
@@ -393,11 +419,11 @@ cc_defaults {
         },
     },
     fuzz_config: {
-       cc: [
+        cc: [
             "cken@google.com",
             "kfcchen@google.com",
-       ],
-        componentid: 31808,  // Android > Android OS & Apps > Systems > core networking
+        ],
+        componentid: 31808, // Android > Android OS & Apps > Systems > core networking
     },
 }
 
diff --git a/tests/dns_metrics_listener/Android.bp b/tests/dns_metrics_listener/Android.bp
index 339f63cf..91fdf8d5 100644
--- a/tests/dns_metrics_listener/Android.bp
+++ b/tests/dns_metrics_listener/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 "packages_modules_DnsResolver_license"
@@ -9,7 +10,10 @@ package {
 
 cc_test_library {
     name: "libnetd_test_metrics_listener",
-    defaults: ["netd_defaults", "resolv_test_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+    ],
     srcs: [
         "base_metrics_listener.cpp",
         "dns_metrics_listener.cpp",
diff --git a/tests/dns_responder/Android.bp b/tests/dns_responder/Android.bp
index f69db964..3d63b689 100644
--- a/tests/dns_responder/Android.bp
+++ b/tests/dns_responder/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 "packages_modules_DnsResolver_license"
@@ -9,7 +10,10 @@ package {
 
 cc_test_library {
     name: "libnetd_test_dnsresponder_ndk",
-    defaults: ["netd_defaults", "resolv_test_defaults"],
+    defaults: [
+        "netd_defaults",
+        "resolv_test_defaults",
+    ],
     shared_libs: [
         "libbinder_ndk",
         "libnetd_client",
diff --git a/tests/unsolicited_listener/Android.bp b/tests/unsolicited_listener/Android.bp
index f68fc7bd..22688e2c 100644
--- a/tests/unsolicited_listener/Android.bp
+++ b/tests/unsolicited_listener/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 "packages_modules_DnsResolver_license"