Move util classes to their destination package
Test: builds
Change-Id: I93e9cfd968e08f983e3fd9f7196c455c79a0f32d
(cherry picked from commit 7c9c12694aec7d688496a634f165661e0681773e)
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index f4799f0..08f4c0e 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -86,6 +86,13 @@
],
}
+// Rules for moving classes part of the lib that haven't been
+// renamed yet for lack of time
+java_defaults {
+ name: "net-utils-jarjar-shared",
+ jarjar_rules: "jarjar-rules-shared.txt",
+}
+
java_library {
name: "net-tests-utils",
srcs: [
@@ -164,8 +171,6 @@
filegroup {
name: "net-utils-framework-wifi-common-srcs",
srcs: [
- "framework/android/net/util/nsd/DnsSdTxtRecord.java",
- "framework/android/net/util/MacAddressUtils.java",
"framework/com/android/net/module/util/**/*.java",
],
path: "framework",
@@ -181,7 +186,7 @@
name: "net-utils-wifi-service-common-srcs",
srcs: [
"device/android/net/NetworkFactory.java",
- "framework/android/net/util/NetUtils.java",
+ "framework/com/android/net/module/util/NetUtils.java",
],
visibility: [
"//frameworks/opt/net/wifi/service",