From c9029a88c743a6c49b19c90e628cd63fc5dc6178 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 23 May 2021 18:00:57 +1000
Subject: [PATCH] CMake: Fix Android native library build

---
 scripts/build_libretro_cores.sh | 5 +++--
 src/CMakeLists.txt              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/build_libretro_cores.sh b/scripts/build_libretro_cores.sh
index 977e0dd9d..71c546dad 100755
--- a/scripts/build_libretro_cores.sh
+++ b/scripts/build_libretro_cores.sh
@@ -8,6 +8,7 @@ make_build() {
   PLATFORM=$1
   OPTIONS=$2
   SUFFIX=$3
+  ZIPFILE=../duckstation_libretro_${PLATFORM}.zip
 
   echo Building for ${PLATFORM}...
 
@@ -19,8 +20,8 @@ make_build() {
   cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON $OPTIONS $ROOTDIR
 
   ninja
-  rm -f ../duckstation_${PLATFORM}.zip
-  zip -j ../duckstation_${PLATFORM}.zip duckstation_libretro${SUFFIX}.so
+  rm -f $ZIPFILE
+  zip -j $ZIPFILE duckstation_libretro${SUFFIX}.so
   cd ..
 }
   
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70d42a876..4dae348af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,11 +6,11 @@ add_subdirectory(common)
 add_subdirectory(core)
 add_subdirectory(scmversion)
 
-if(BUILD_NOGUI_FRONTEND OR BUILD_QT_FRONTEND)
+if(NOT BUILD_LIBRETRO_CORE)
   add_subdirectory(frontend-common)
 endif()
 
-if(NOT BUILD_LIBRETRO_CORE)
+if(NOT BUILD_LIBRETRO_CORE AND NOT ANDROID)
   add_subdirectory(common-tests)
   if(WIN32)
     add_subdirectory(updater)