From 7068e50815b97c6d2eccba55155cd0c1f0e78112 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Fri, 23 Mar 2018 09:44:49 -0700 Subject: [PATCH] Test Android API version --- CMakeLists.txt | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4583c750..d4899e164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -684,6 +684,7 @@ endif() if(ANDROID) set(ATOMIC libatomic.a) endif() +message(${__ANDROID_API__}) if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH_WIDTH EQUAL "32" AND NOT IOS) find_library(ATOMIC atomic) list(APPEND EXTRA_LIBRARIES ${ATOMIC}) diff --git a/Makefile b/Makefile index 6b00f1769..4f6e6465f 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ release-static-linux-armv7: release-static-android: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D __ANDROID_API__=21 -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android" ../.. && $(MAKE) + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android" ../.. && $(MAKE) release-static-linux-armv8: mkdir -p build/release