commit e905f8b7a7136ebff670fe3de759369790d827eb
author William Escande <wescande@google.com> Fri Jul 12 21:43:24 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 12 21:43:24 2024 +0000
tree a5771f1c5d9bb5b44abc8f8fe27c351e6ec68340
parent f7cc59e9b90fb8c09eb42cc4a2055b31b2603000
parent 63b1d4561c267e9e569f177b7ce4b0efcdea6d9b

Merge "fix dependency on modules-utils-build" into main am: 63b1d4561c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3165104

Change-Id: I2f03187324a68f391e7b233d525fb3c84a723375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 2c3a558..14bd5df 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -345,12 +345,10 @@
     ],
     sdk_version: "module_current",
     min_sdk_version: "30",
-    static_libs: [
-        "modules-utils-build_system",
-    ],
     libs: [
         "framework-annotations-lib",
         "framework-connectivity",
+        "modules-utils-build_system",
     ],
     // TODO: remove "apex_available:platform".
     apex_available: [

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 2f88c41..ef3ebb0 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -92,6 +92,7 @@
         "frameworks-net-integration-testutils",
         "framework-protos",
         "mockito-target-minus-junit4",
+        "modules-utils-build",
         "net-tests-utils",
         "net-utils-services-common",
         "platform-compat-test-rules",