Merge pull request #261 from ivpn/bugfix/fdroid-build-issue

Compile liboqs library from source

.github/workflows/build.yml

@@ -17,6 +17,14 @@ jobs:
 
     - name: Checkout submodules
       run: git submodule update --init --recursive
+
+    - name: Set up NDK
+      uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r25b
+
+    - name: Install liboqs dependencies
+      run: sudo apt-get update && sudo apt-get install -y astyle cmake gcc ninja-build libssl-dev python3-pytest python3-pytest-xdist unzip xsltproc doxygen graphviz python3-yaml valgrind
 
     - name: Set up JDK 11
       uses: actions/setup-java@v3

.gitignore

@@ -15,3 +15,4 @@ keystore.properties
 core/.cxx/
 /store/production/
 /production/
+liboqs-android/**/*.so

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "core/src/main/cpp/lz4"]
 	path = core/src/main/cpp/lz4
 	url = https://github.com/lz4/lz4.git
+[submodule "liboqs-android/jni/liboqs"]
+	path = liboqs-android/jni/liboqs
+	url = https://github.com/ivpn/liboqs

core/build.gradle

@@ -31,6 +31,7 @@ android {
         targetSdkVersion 31
         versionCode 124
         versionName "2.10.2"
+        ndkVersion "25.1.8937393"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -143,12 +144,47 @@ def File registerGenTask(variantName, variantDirName) {
     return baseDir
 }
 
+def kemScript = "./../liboqs-android/jni/liboqs/scripts/build-android.sh"
+def kemPlatform = "android-21"
+def kemMechanisms = "KEM_kyber_1024;"
+
+tasks.register("buildLiboqsARM64", Exec) {
+    commandLine kemScript, android.ndkDirectory, "-a", "arm64-v8a", "-p", kemPlatform, "-m", kemMechanisms
+}
+
+tasks.register("buildLiboqsARM", Exec) {
+    commandLine kemScript, android.ndkDirectory, "-a", "armeabi-v7a", "-p", kemPlatform, "-m", kemMechanisms
+}
+
+tasks.register("buildLiboqsX8664", Exec) {
+    commandLine kemScript, android.ndkDirectory, "-a", "x86_64", "-p", kemPlatform, "-m", kemMechanisms
+}
+
+tasks.register("buildLiboqsX86", Exec) {
+    commandLine kemScript, android.ndkDirectory, "-a", "x86", "-p", kemPlatform, "-m", kemMechanisms
+}
 
 android.libraryVariants.all { variant ->
     def sourceDir = registerGenTask(variant.name, variant.baseName.replace("-", "/"))
-    def task = tasks.named("generateOpenVPN3Swig${variant.name}").get()
+    def generateOpenVPN3Swig = tasks.named("generateOpenVPN3Swig${variant.name}").get()
+    def buildLiboqsARM64 = tasks.named("buildLiboqsARM64").get()
+    def buildLiboqsARM = tasks.named("buildLiboqsARM").get()
+    def buildLiboqsX8664 = tasks.named("buildLiboqsX8664").get()
+    def buildLiboqsX86 = tasks.named("buildLiboqsX86").get()
+    variant.registerJavaGeneratingTask(generateOpenVPN3Swig, sourceDir)
+    variant.registerJavaGeneratingTask(buildLiboqsARM64, sourceDir)
+    variant.registerJavaGeneratingTask(buildLiboqsARM, sourceDir)
+    variant.registerJavaGeneratingTask(buildLiboqsX8664, sourceDir)
+    variant.registerJavaGeneratingTask(buildLiboqsX86, sourceDir)
+}
 
-    variant.registerJavaGeneratingTask(task, sourceDir)
+project.afterEvaluate {
+    preBuild.dependsOn(
+        tasks.named("buildLiboqsARM64").get(),
+        tasks.named("buildLiboqsARM").get(),
+        tasks.named("buildLiboqsX8664").get(),
+        tasks.named("buildLiboqsX86").get()
+    )
 }
 
 ext {

core/tools/CMakeLists.txt

@@ -5,9 +5,6 @@
 cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
-# Work around https://github.com/android-ndk/ndk/issues/602
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-
 add_executable(libwg-quick.so wireguard-tools/src/wg-quick/android.c ndk-compat/compat.c)
 target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
 target_link_libraries(libwg-quick.so -ldl)
@@ -26,7 +23,6 @@ add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib
         ANDROID_PACKAGE_NAME=${ANDROID_PACKAGE_NAME}
         GRADLE_USER_HOME=${GRADLE_USER_HOME}
         CFLAGS=${CMAKE_C_FLAGS}\ -Wno-unused-command-line-argument
-        LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}\ -fuse-ld=gold
         DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
         BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src
         )

fdroid/build.gradle

@@ -33,6 +33,7 @@ android {
         targetSdkVersion 30
         versionCode 124
         versionName "2.10.2"
+        ndkVersion "25.1.8937393"
 
         manifestPlaceholders = [SENTRY_DSN: keystoreProperties['sentry.dsn']]
         buildConfigField "String", "BILLING_PUBLIC_KEY", keystoreProperties['billing.public.key']

gradle.properties

@@ -12,7 +12,7 @@
 android.enableJetifier=true
 android.useAndroidX=true
 android.bundle.enableUncompressedNativeLibs = false
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048M
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

site/build.gradle

@@ -32,6 +32,7 @@ android {
         targetSdkVersion 31
         versionCode 124
         versionName "2.10.2"
+        ndkVersion "25.1.8937393"
 
         manifestPlaceholders = [SENTRY_DSN: keystoreProperties['sentry.dsn']]
         buildConfigField "String", "BILLING_PUBLIC_KEY", keystoreProperties['billing.public.key']

store/build.gradle

@@ -33,6 +33,7 @@ android {
         targetSdkVersion 31
         versionCode 124
         versionName "2.10.2"
+        ndkVersion "25.1.8937393"
 
         manifestPlaceholders = [SENTRY_DSN: keystoreProperties['sentry.dsn']]
         buildConfigField "String", "BILLING_PUBLIC_KEY", keystoreProperties['billing.public.key']