Move resolver public headers to separate include path
Additionally rename functions and structs to eliminate those ugly
underscores from the public API (with the notable exception of
__res_params, which will come in its own separate change to keep this
one from growing too large).
Test: build, flash, then 'atest netd_integration_test'
Change-Id: I7e9b0ee6cdbec889e9c35b5a17b5daa65533686e
diff --git a/server/FwmarkServer.cpp b/server/FwmarkServer.cpp
index dcbdb5d..dc05093 100644
--- a/server/FwmarkServer.cpp
+++ b/server/FwmarkServer.cpp
@@ -16,13 +16,6 @@
#include "FwmarkServer.h"
-#include "Fwmark.h"
-#include "FwmarkCommand.h"
-#include "NetdConstants.h"
-#include "NetworkController.h"
-#include "TrafficController.h"
-#include "resolv_netid.h"
-
#include <netinet/in.h>
#include <selinux/selinux.h>
#include <sys/socket.h>
@@ -30,6 +23,13 @@
#include <utils/String16.h>
#include <binder/IServiceManager.h>
+#include <netd_resolv/resolv.h> // NETID_UNSET
+
+#include "Fwmark.h"
+#include "FwmarkCommand.h"
+#include "NetdConstants.h"
+#include "NetworkController.h"
+#include "TrafficController.h"
using android::String16;
using android::net::metrics::INetdEventListener;