rename ClatUtils to OffloadUtils
Generated via:
mv server/ClatUtils.h server/OffloadUtils.h
mv server/ClatUtils.cpp server/OffloadUtils.cpp
mv server/ClatUtilsTest.cpp server/OffloadUtilsTest.cpp
sed -i -r 's@ClatUtils@OffloadUtils@g' server/OffloadUtils.cpp
sed -i -r 's@ClatUtils@OffloadUtils@g' server/OffloadUtilsTest.cpp
sed -i -r 's@ClatUtils@OffloadUtils@g' server/Android.bp
sed -i -r 's@ClatUtils@OffloadUtils@g' server/ClatdController.cpp
+ sort Android.bp
+ sort include order in server/ClatdController.cpp
Test: build, atest
'find | egrep ClatUtils' and 'git grep ClatUtils' come up empty
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I33dbfab8241fd378d1d6ab44843bdae17196e2d1
diff --git a/server/Android.bp b/server/Android.bp
index 2424f08..d044d88 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -71,7 +71,6 @@
srcs: [
"BandwidthController.cpp",
"ClatdController.cpp",
- "ClatUtils.cpp",
"Controllers.cpp",
"NetdConstants.cpp",
"FirewallController.cpp",
@@ -82,6 +81,7 @@
"NetlinkCommands.cpp",
"NetlinkListener.cpp",
"NetlinkManager.cpp",
+ "OffloadUtils.cpp",
"RouteController.cpp",
"SockDiag.cpp",
"StrictController.cpp",
@@ -222,7 +222,6 @@
srcs: [
"BandwidthControllerTest.cpp",
"ClatdControllerTest.cpp",
- "ClatUtilsTest.cpp",
"ControllersTest.cpp",
"FirewallControllerTest.cpp",
"IdletimerControllerTest.cpp",
@@ -230,6 +229,7 @@
"IptablesBaseTest.cpp",
"IptablesRestoreControllerTest.cpp",
"NFLogListenerTest.cpp",
+ "OffloadUtilsTest.cpp",
"RouteControllerTest.cpp",
"SockDiagTest.cpp",
"StrictControllerTest.cpp",