Skip to content
Snippets Groups Projects
Commit 1e6ae27b authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

start android 64 bit updates

parent 8d49b82a
No related branches found
No related tags found
No related merge requests found
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
applicationId "org.geuz.onelab"
minSdkVersion 15
targetSdkVersion 28
minSdkVersion 16
targetSdkVersion 29
ndk.abiFilters "armeabi-v7a", "arm64-v8a"
}
signingConfigs {
......
......@@ -52,10 +52,13 @@ if [ -f ${models_dir}/cleanup.sh ]; then
cd ${models_dir} && ./cleanup.sh
fi
cmake_default="-DDEFAULT=0 -DENABLE_PRIVATE_API=1 -DCMAKE_TOOLCHAIN_FILE=${android_ndk}/build/cmake/android.toolchain.cmake -DANDROID_STL_FORCE_FEATURES=1 -DENABLE_BUILD_ANDROID=1 -DCMAKE_BUILD_TYPE=Release"
if [ $enable_simulator != 0 ]; then
cmake_default="-DDEFAULT=0 -DENABLE_PRIVATE_API=1 -DCMAKE_TOOLCHAIN_FILE=${android_ndk}/build/cmake/android.toolchain.cmake -DANDROID_STL_FORCE_FEATURES=1 -DENABLE_BUILD_ANDROID=1 -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI=x86_64"
cmake_default="${cmake_default} -DANDROID_ABI=x86_64"
else
cmake_default="-DDEFAULT=0 -DENABLE_PRIVATE_API=1 -DCMAKE_TOOLCHAIN_FILE=${android_ndk}/build/cmake/android.toolchain.cmake -DANDROID_STL_FORCE_FEATURES=1 -DENABLE_BUILD_ANDROID=1 -DCMAKE_BUILD_TYPE=Release"
cmake_default="${cmake_default} -DANDROID_ABI=arm64-v8a"
# for old 32 bit app: -DANDROID_ABI=armeabi-v7a
fi
cmake_thread=6
......
......@@ -15,7 +15,6 @@ xcodebuild -configuration Release OTHER_CFLAGS="-miphoneos-version-min=8.0 -femb
# Then combine all static libs using merge_static_libs.sh and put it in OCCT.framework
################## Android ####
cmake -DCMAKE_TOOLCHAIN_FILE=~/Library/Android/sdk/ndk-bundle/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MODULE_Draw=0 -DBUILD_MODULE_Visualization=0 -DBUILD_MODULE_ApplicationFramework=0 -DBUILD_LIBRARY_TYPE=Static -DCMAKE_PREFIX_PATH=/opt/local ..
cmake -DCMAKE_TOOLCHAIN_FILE=~/Library/Android/sdk/ndk-bundle/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MODULE_Draw=0 -DBUILD_MODULE_Visualization=0 -DBUILD_MODULE_ApplicationFramework=0 -DBUILD_LIBRARY_TYPE=Static -DCMAKE_PREFIX_PATH=/opt/local -DANDROID_ABI=arm64-v8a ..
make -j 8 -k ### -k so that compilation will continue even when linking to freetype fails
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment