Merge "Introduce cache schema for generic Struct class."
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 08febfe..a1a998e 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -45,6 +45,7 @@
],
visibility: [
"//frameworks/base/packages/Tethering",
+ "//packages/modules/Connectivity/Tethering",
"//frameworks/opt/net/ike",
"//frameworks/opt/net/wifi/service",
"//frameworks/opt/net/telephony",
@@ -123,7 +124,9 @@
jarjar_rules: "jarjar-rules-shared.txt",
visibility: [
"//cts/tests/tests/net",
+ "//packages/modules/Connectivity/tests/cts/net",
"//frameworks/base/packages/Tethering",
+ "//packages/modules/Connectivity/Tethering",
"//frameworks/base/tests:__subpackages__",
"//frameworks/opt/net/ike",
"//frameworks/opt/telephony",
@@ -134,10 +137,20 @@
]
}
+filegroup {
+ name: "net-utils-services-common-srcs",
+ srcs: [
+ "device/android/net/NetworkFactory.java",
+ ],
+ visibility: [
+ "//frameworks/base/services/net",
+ ],
+}
+
java_library {
name: "net-utils-services-common",
srcs: [
- "device/android/net/NetworkFactory.java",
+ ":net-utils-services-common-srcs",
":framework-annotations",
],
sdk_version: "system_current",
diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp
index 199b8cc..c20b87d 100644
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@@ -19,6 +19,7 @@
jarjar_rules: "jarjar-rules-sharedlib.txt",
visibility: [
"//frameworks/base/packages/Tethering/tests/integration",
+ "//packages/modules/Connectivity/Tethering/tests/integration",
"//packages/modules/NetworkStack/tests/integration",
]
}