[Android] Unified xenia-app with windowed apps and build prerequisites

src/xenia/cpu/testing/premake5.lua

@@ -8,10 +8,17 @@ test_suite("xenia-cpu-tests", project_root, ".", {
     "xenia-base",
     "xenia-core",
     "xenia-cpu",
-    "xenia-cpu-backend-x64",
 
     -- TODO(benvanik): cut these dependencies?
     "xenia-kernel",
     "xenia-ui", -- needed by xenia-base
   },
+  filtered_links = {
+    {
+      filter = 'architecture:x86_64',
+      links = {
+        "xenia-cpu-backend-x64",
+      },
+    }
+  },
 })

src/xenia/cpu/testing/util.h

@@ -12,6 +12,7 @@
 
 #include <vector>
 
+#include "xenia/base/platform.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/ppc/ppc_context.h"
@@ -21,8 +22,6 @@
 
 #include "third_party/catch/include/catch.hpp"
 
-#define XENIA_TEST_X64 1
-
 namespace xe {
 namespace cpu {
 namespace testing {
@@ -36,14 +35,17 @@ class TestFunction {
     memory.reset(new Memory());
     memory->Initialize();
 
-#if XENIA_TEST_X64
     {
-      auto backend = std::make_unique<xe::cpu::backend::x64::X64Backend>();
-      auto processor = std::make_unique<Processor>(memory.get(), nullptr);
-      processor->Setup(std::move(backend));
-      processors.emplace_back(std::move(processor));
+      std::unique_ptr<xe::cpu::backend::Backend> backend;
+#if XE_ARCH_AMD64
+      backend.reset(new xe::cpu::backend::x64::X64Backend());
+#endif  // XE_ARCH
+      if (backend) {
+        auto processor = std::make_unique<Processor>(memory.get(), nullptr);
+        processor->Setup(std::move(backend));
+        processors.emplace_back(std::move(processor));
+      }
     }
-#endif  // XENIA_TEST_X64
 
     for (auto& processor : processors) {
       auto module = std::make_unique<xe::cpu::TestModule>(