From 279f469f42a61bdf54987650c79a9ee5625e7525 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Sat, 7 Sep 2024 13:06:59 -0600
Subject: [PATCH] Fixed build issues

Co-authored-by: Reg Tiangha <rtiangha@users.noreply.github.com>
---
 src/core/CMakeLists.txt     |  4 ++++
 src/core/rpc/rpc_server.cpp | 17 +++++++++++++++++
 src/core/rpc/rpc_server.h   |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f069ff33d..9b21bb524 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -499,6 +499,10 @@ target_link_libraries(citra_core PUBLIC citra_common PRIVATE audio_core network
 target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams httplib)
 target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt lodepng open_source_archives)
 
+if (NOT ANDROID)
+    target_link_libraries(citra_core PUBLIC input_common)
+endif()
+
 if (ENABLE_WEB_SERVICE)
     target_link_libraries(citra_core PRIVATE web_service)
 endif()
diff --git a/src/core/rpc/rpc_server.cpp b/src/core/rpc/rpc_server.cpp
index 909a64858..17f971b02 100644
--- a/src/core/rpc/rpc_server.cpp
+++ b/src/core/rpc/rpc_server.cpp
@@ -7,8 +7,11 @@
 #include "core/memory.h"
 #include "core/rpc/packet.h"
 #include "core/rpc/rpc_server.h"
+
+#ifndef ANDROID
 #include "input_common/keyboard.h"
 #include "input_common/main.h"
+#endif
 
 namespace Core::RPC {
 
@@ -47,6 +50,7 @@ void RPCServer::HandleWriteMemory(Packet& packet, u32 address, std::span<const u
     packet.SendReply();
 }
 
+#ifndef ANDROID
 void RPCServer::HandleSendKey(Packet& packet, u32 key_code, u8 state) {
     if (state == 0) {
         InputCommon::GetKeyboard()->ReleaseKey(key_code);
@@ -63,6 +67,7 @@ void RPCServer::HandleSendSignal(Packet& packet, u32 signal_code, u32 signal_par
     packet.SetPacketDataSize(0);
     packet.SendReply();
 }
+#endif
 
 bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
     if (packet_header.version <= CURRENT_VERSION) {
@@ -73,6 +78,8 @@ bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
                 return true;
             }
             break;
+
+#ifndef ANDROID
         case PacketType::SendKey:
             if (packet_header.packet_size >= (sizeof(u32) + sizeof(u8))) {
                 return true;
@@ -83,6 +90,8 @@ bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
                 return true;
             }
             break;
+#endif
+
         default:
             break;
         }
@@ -97,10 +106,14 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
     if (ValidatePacket(request_packet->GetHeader())) {
         u32 address = 0;
         u32 data_size = 0;
+
+#ifndef ANDROID
         u32 key_code = 0;
         u8 key_state = 0;
         u32 signal_code = 0;
         u32 signal_parameter = 0;
+#endif
+
         switch (request_packet->GetPacketType()) {
         case PacketType::ReadMemory:
             std::memcpy(&address, packet_data.data(), sizeof(address));
@@ -118,6 +131,8 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
                 success = true;
             }
             break;
+
+#ifndef ANDROID
         case PacketType::SendKey:
             std::memcpy(&key_code, packet_data.data(), sizeof(key_code));
             std::memcpy(&key_state, packet_data.data() + sizeof(key_code), sizeof(key_state));
@@ -130,6 +145,8 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
                         sizeof(signal_parameter));
             HandleSendSignal(*request_packet, signal_code, signal_parameter);
             break;
+#endif
+
         default:
             break;
         }
diff --git a/src/core/rpc/rpc_server.h b/src/core/rpc/rpc_server.h
index 5d2bb72f7..97a426c49 100644
--- a/src/core/rpc/rpc_server.h
+++ b/src/core/rpc/rpc_server.h
@@ -29,8 +29,12 @@ public:
 private:
     void HandleReadMemory(Packet& packet, u32 address, u32 data_size);
     void HandleWriteMemory(Packet& packet, u32 address, std::span<const u8> data);
+
+#ifndef ANDROID
     void HandleSendKey(Packet& packet, u32 key_code, u8 state);
     void HandleSendSignal(Packet& packet, u32 signal_code, u32 signal_parameter);
+#endif
+
     bool ValidatePacket(const PacketHeader& packet_header);
     void HandleSingleRequest(std::unique_ptr<Packet> request);
     void HandleRequestsLoop(std::stop_token stop_token);