From 2bbc2f79de3c052d49bc039f11be15d1c28ec12c Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Mon, 24 Jan 2022 07:58:12 +0000
Subject: [PATCH] Make net-utils-services-common visible to
 service-connectivity-tiramisu.

Ethernet service sources are moving to Connectivity module, which has
dependency on the NetworkFactory class such as EthernetNetworkFactory.
Import this lib in service-connectivity-tiramisu-pre-jarjar to fix this
dependency.

Bug: 202086915
Test: m
Change-Id: I2f92479f56af110d89c9fa95eca725af7132b66f
---
 staticlibs/Android.bp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index bdd0c74223..0e4dac23cb 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -287,9 +287,15 @@ java_library {
         "framework-annotations-lib",
         "framework-connectivity",
     ],
+    // TODO: remove "apex_available:platform".
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.tethering",
+    ],
     visibility: [
         // TODO: remove after NetworkStatsService moves to the module.
         "//frameworks/base/services/net",
+        "//packages/modules/Connectivity/service",
         "//packages/modules/Connectivity/tests:__subpackages__",
         "//packages/modules/Bluetooth/android/app",
     ],