commit 20559c08a056e99736c5e01966be178ab4bffbdf
author Remi NGUYEN VAN <reminv@google.com> Fri Apr 02 09:18:29 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 02 09:18:29 2021 +0000
tree e83adb8a01393451cc7f7cff986e08b5b23a0a96
parent ba2329a83f771d6e3c3e72bbcea465d6ad177b9b
parent 2202e614928ff83dc92bfa22f865573f4bf527fb

Merge "Allow hidden connectivity APIs in net test utils" into sc-dev

staticlibs/tests/unit/Android.bp

diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp
index 45a89b0..c9aad71 100644
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@@ -10,6 +10,7 @@
     name: "NetworkStaticLibTestsLib",
     srcs: ["src/**/*.java","src/**/*.kt"],
     min_sdk_version: "29",
+    defaults: ["framework-connectivity-test-defaults"],
     static_libs: [
         "net-utils-framework-common",
         "androidx.test.rules",

staticlibs/testutils/Android.bp

diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
index d4465dd..1a7b437 100644
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@@ -22,7 +22,10 @@
         "devicetests/**/*.java",
         "devicetests/**/*.kt",
     ],
-    defaults: ["lib_mockito_extended"],
+    defaults: [
+        "framework-connectivity-test-defaults",
+        "lib_mockito_extended"
+    ],
     libs: [
         "androidx.annotation_annotation",
     ],