From c85ccd25bb8a7430a081e64eee06744c1cb51d44 Mon Sep 17 00:00:00 2001 From: ignaciogarcia Date: Mon, 31 Oct 2022 16:58:21 +0100 Subject: [PATCH] PEMA-103 WIP --- android/build.gradle | 10 ++++++++-- android/jni/Android.mk | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 8a080a0..2a2b7ce 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,7 @@ // Android pEp JNI adapter Aar gradle build script def pEpEngineSrc = hasProperty('pEpEngineSrc') ? pEpEngineSrc : "../../pEpEngine" +def libpEpTransportSrc = hasProperty('libpEpTransportSrc') ? libpEpTransportSrc : "../../libpEpTransport" def buildAutomatic = hasProperty('buildAutomatic') ? buildAutomatic : "true" //CHeck M1 answers the correct thing off .avaialableprocessors here //def threadsToUse = hasProperty('threadsToUse') ? @@ -102,7 +103,12 @@ android { commandLine 'make', 'lib-java' } - task genpEpEngineSyncSources(type:Exec) { + task genlibpEpTransportSources(type:Exec) { + workingDir "${libpEpTransportSrc}" + commandLine 'make', "-j${threadsToUse}" + } + + task genpEpEngineSyncSources(type:Exec, dependsOn: 'genlibpEpTransportSources') { workingDir "${pEpEngineSrc}" commandLine 'make', "-j${threadsToUse}", '-C', 'codegen' } @@ -169,7 +175,7 @@ android { preBuild.dependsOn(externalAssets) } -def isIdeBuild() { +boolean isIdeBuild() { boolean runningFromIde = project.properties['android.injected.invoked.from.ide'] == 'true' if (runningFromIde) { println("GRADLE RUNNING FROM IDE") diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 41fc9e8..e6dd4a6 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -58,6 +58,7 @@ LOCAL_SRC_FILES := \ ../../src/cxx/jniutils.cc LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include +#LOCAL_C_INCLUDES += $(ENGINE_PATH)/build-android/include/pEp LOCAL_C_INCLUDES += $(LIB_PEP_ADAPTER_PATH)/build-android/include $(SRC_PATH)/libpEpAdapter LOCAL_C_INCLUDES += $(LIB_PEP_CXX11_PATH)/build-android/include $(SRC_PATH)/libpEpCxx11 LOCAL_C_INCLUDES += $(ENGINE_PATH)/asn.1