Follow-ups to the LIBRETRO ifdef removal

D3D11 sets logic op support from the device again (off on UWP) and
always reports object names: the UWP check's else had swallowed the
object-name line and logic op was never on. The Android input backend
is no longer created, so its source, include and CIFACE_USE_ANDROID go.
Core.h declarations indented with spaces like the rest of the file.

Makefile.common

@@ -1732,8 +1732,7 @@ ifeq ($(OS_ANDROID),1)
 	$(CORE_DIR)/Source/Android/jni/AndroidCommon/AndroidCommon.cpp \
 	$(CORE_DIR)/Source/Android/jni/AndroidCommon/IDCache.cpp \
 	$(CORE_DIR)/Source/Core/Common/Logging/ConsoleListenerDroid.cpp \
-	$(CORE_DIR)/Source/Core/Common/MemArenaAndroid.cpp \
-	$(CORE_DIR)/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+	$(CORE_DIR)/Source/Core/Common/MemArenaAndroid.cpp
 endif
 ifeq ($(OS_APPLE),1)
    DOLPHIN_SOURCES_CXX += \
@@ -2001,7 +2000,7 @@ ifeq ($(OS_WIN),1)
 	-I$(EXT_DIR)/wil/include -I$(EXT_DIR)/ed25519
 endif
 ifeq ($(OS_ANDROID),1)
-   DOLPHIN_FLAGS += -DENABLE_VFS_FD -DCIFACE_USE_ANDROID \
+   DOLPHIN_FLAGS += -DENABLE_VFS_FD \
 	-I$(EXT_DIR)/libadrenotools/include -I$(EXT_DIR)/libadrenotools/lib/linkernsbypass
 endif
 

Source/Core/Core/Core.h

@@ -191,13 +191,12 @@ void UpdateInputGate(bool require_focus, bool require_full_focus = false);
 
 void UpdateTitle(Core::System& system);
 
-void EmuThread(Core::System& system, std::unique_ptr<BootParameters> boot,
-		WindowSystemInfo wsi);
+void EmuThread(Core::System& system, std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi);
 void SingleCorePostRunShutdown();
 extern std::unique_ptr<BootParameters> g_boot_params;
 // Starts EmuThread on its own thread (dual core); s_emu_thread is its handle.
 bool StartEmuThread(Core::System& system, std::unique_ptr<BootParameters> boot,
-		const WindowSystemInfo& wsi);
+                    const WindowSystemInfo& wsi);
 extern sthread_t* s_emu_thread;
 extern bool s_frame_step;
 

Source/Core/InputCommon/ControllerInterface/Android/Android.h

@@ -1,12 +0,0 @@
-// Copyright 2021 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "InputCommon/ControllerInterface/InputBackend.h"
-
-namespace ciface::Android
-{
-std::unique_ptr<ciface::InputBackend> CreateInputBackend(ControllerInterface* controller_interface);
-
-}  // namespace ciface::Android

Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp

@@ -10,9 +10,6 @@
 #include "Common/Logging/Log.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 
-#ifdef CIFACE_USE_ANDROID
-#include "InputCommon/ControllerInterface/Android/Android.h"
-#endif
 #ifdef CIFACE_USE_DUALSHOCKUDPCLIENT
 #include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"
 #endif

Source/Core/VideoBackends/D3D/D3DMain.cpp

@@ -109,10 +109,9 @@ void VideoBackend::FillBackendInfo()
   g_backend_info.bSupportsCoarseDerivatives = true;
   g_backend_info.bSupportsTextureQueryLevels = true;
   g_backend_info.bSupportsLodBiasInSampler = true;
-  if (Common::is_uwp())
-    g_backend_info.bSupportsLogicOp = false;
-  else
-    g_backend_info.bSupportsSettingObjectNames = true;
+  g_backend_info.bSupportsLogicOp =
+      !Common::is_uwp() && D3D::SupportsLogicOp(g_Config.iAdapter);
+  g_backend_info.bSupportsSettingObjectNames = true;
   g_backend_info.bSupportsPartialMultisampleResolve = true;
   g_backend_info.bSupportsDynamicVertexLoader = false;
   g_backend_info.bSupportsHDROutput = true;