Add net-utils-services-common library
net-utils-services-common-srcs for files in src_servicescommon
and library net-utils-services-common could be used in services.jar
or modules.
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksTelephonyTests
Change-Id: I5043a34100e9ef26148e3a0c1743363d063a3604
Merged-In: I5043a34100e9ef26148e3a0c1743363d063a3604
(clean cherry-pick from internal branch)
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index ffc02c3..5c851fd 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -12,9 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// File group "net-utils-framework-common-srcs" is also compiled into android framework.
-// Add jarjar rules here so that anything outside of framework could use this library
-// directly.
+// 1. The "net-utils-framework-common" library is also compiled into the framework and placed on the
+// boot classpath. It uses jarjar rules so that anything outside the framework can use this
+// library directly.
+// 2. The "net-utils-services-common" library is for use by modules and frameworks/base/services.
+// It does not need to be jarjared because it is not placed on the bootclasspath.
filegroup {
name: "net-utils-framework-common-srcs",
@@ -35,3 +37,16 @@
"//packages/modules/CaptivePortalLogin",
]
}
+
+java_library {
+ name: "net-utils-services-common",
+ srcs: ["src_servicescommon/**/*.java"],
+ visibility: [
+ "//frameworks/base/services",
+ "//frameworks/base/packages/Tethering",
+ "//frameworks/opt/net/wifi/service",
+ "//frameworks/opt/net/ike",
+ "//packages/modules/NetworkStack",
+ "//packages/modules/CaptivePortalLogin",
+ ],
+}