cmake: Enable all tests for Android targets

Signed-off-by: Andrew Gunnerson <[email protected]>
Dark98 · Jul 3, 2018 · e8073b5 · e8073b5
1 parent d333a7d
commit e8073b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
@@ -47,7 +47,7 @@ if(MBP_TOP_LEVEL_BUILD)
             -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
             -DANDROID_ABI=${abi}
             -DMBP_BUILD_TYPE=${MBP_BUILD_TYPE}
-            -DMBP_ENABLE_TESTS=OFF
+            -DMBP_ENABLE_TESTS=${MBP_ENABLE_TESTS}
             -DMBP_PREBUILTS_BINARY_DIR=${MBP_PREBUILTS_BINARY_DIR}
             -DMBP_SIGN_CONFIG_PATH=${MBP_SIGN_CONFIG_PATH}
             -DJAVA_KEYTOOL=${JAVA_KEYTOOL}

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -27,6 +27,7 @@ if(${MBP_BUILD_TARGET} STREQUAL desktop)
     include(cmake/dependencies/qt5.cmake)
     include(cmake/dependencies/zlib.cmake)
 elseif(${MBP_BUILD_TARGET} STREQUAL android-app)
+    include(cmake/dependencies/googletest.cmake)
     include(cmake/dependencies/iconv.cmake)
     include(cmake/dependencies/libarchive.cmake)
     include(cmake/dependencies/liblzma.cmake)
@@ -41,6 +42,7 @@ elseif(${MBP_BUILD_TARGET} STREQUAL android-system)
     include(cmake/dependencies/android-system-core.cmake)
     include(cmake/dependencies/freetype2.cmake)
     include(cmake/dependencies/fuse.cmake)
+    include(cmake/dependencies/googletest.cmake)
     include(cmake/dependencies/iconv.cmake)
     include(cmake/dependencies/libarchive.cmake)
     include(cmake/dependencies/libdrm.cmake)