[android] replace VendorServer with OtDaemonServer

To make it easier to update the OtDaemonServer implementation
without making separate changes on both GitHub and AOSP.

src/agent/CMakeLists.txt

@@ -30,7 +30,6 @@ add_executable(otbr-agent
     application.cpp
     main.cpp
     uris.hpp
-    vendor.hpp
 )
 
 target_link_libraries(otbr-agent PRIVATE

src/agent/application.cpp

@@ -76,8 +76,8 @@ Application::Application(const std::string               &aInterfaceName,
 #if OTBR_ENABLE_DBUS_SERVER && OTBR_ENABLE_BORDER_AGENT
     , mDBusAgent(mNcp, mBorderAgent.GetPublisher())
 #endif
-#if OTBR_ENABLE_VENDOR_SERVER
-    , mVendorServer(mNcp)
+#if OTBR_ENABLE_ANDROID_OTDAEMON_SERVER
+    , mOtDaemonServer(ndk::SharedRefBase::make<Android::OtDaemonServer>())
 #endif
 {
     OTBR_UNUSED_VARIABLE(aRestListenAddress);
@@ -103,8 +103,8 @@ void Application::Init(void)
 #if OTBR_ENABLE_DBUS_SERVER
     mDBusAgent.Init();
 #endif
-#if OTBR_ENABLE_VENDOR_SERVER
-    mVendorServer.Init();
+#if OTBR_ENABLE_ANDROID_OTDAEMON_SERVER
+    mOtDaemonServer->InitOrDie(&mNcp);
 #endif
 }
 

src/agent/application.hpp

@@ -57,8 +57,8 @@
 #if OTBR_ENABLE_OPENWRT
 #include "openwrt/ubus/otubus.hpp"
 #endif
-#if OTBR_ENABLE_VENDOR_SERVER
-#include "agent/vendor.hpp"
+#if OTBR_ENABLE_ANDROID_OTDAEMON_SERVER
+#include "android/otdaemon_server.hpp"
 #endif
 #include "utils/infra_link_selector.hpp"
 
@@ -146,8 +146,8 @@ class Application : private NonCopyable
 #if OTBR_ENABLE_DBUS_SERVER
     DBus::DBusAgent mDBusAgent;
 #endif
-#if OTBR_ENABLE_VENDOR_SERVER
-    vendor::VendorServer mVendorServer;
+#if OTBR_ENABLE_ANDROID_OTDAEMON_SERVER
+    std::shared_ptr<Android::OtDaemonServer> mOtDaemonServer;
 #endif
 
     static std::atomic_bool sShouldTerminate;