Revert "Move util classes to their destination package"
Revert "Move PacketReader and FdEventReader"
Revert "Move static utils to a module package"
Revert "Move static utils to a module package"
Revert submission 12698912-move_packetreader
Reason for revert: Broke presubmit on git_master, b/169861635
Reverted Changes:
If5d1e4a58:Move module utils to the module package.
I44ffaad3d:Move PacketReader and FdEventReader
I93e9cfd96:Move util classes to their destination package
Ia84d64130:Move static utils to a module package
Iaac2810c7:Move static utils to a module package
Change-Id: I6104ea5392b26069da9a54f3073fd408a0bc37a0
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 08f4c0e..f4799f0 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -86,13 +86,6 @@
],
}
-// 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: [
@@ -171,6 +164,8 @@
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",
@@ -186,7 +181,7 @@
name: "net-utils-wifi-service-common-srcs",
srcs: [
"device/android/net/NetworkFactory.java",
- "framework/com/android/net/module/util/NetUtils.java",
+ "framework/android/net/util/NetUtils.java",
],
visibility: [
"//frameworks/opt/net/wifi/service",