Browse Source

JNI-26 fixed include path for pEpEngine includes, according to new JNI build.

JNI-44
Edouard Tisserant 9 years ago
parent
commit
30f2c10694
  1. 13
      android/build.gradle
  2. 6
      src/gen_cpp_Engine.ysl2
  3. 2
      src/gen_cpp_Message.ysl2
  4. 6
      src/jniutils.hh
  5. 6
      src/org_pEp_jniadapter_AbstractEngine.cc

13
android/build.gradle

@ -8,7 +8,6 @@ def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "
def libetpanAndroid = file('external/libetpan/build-android') def libetpanAndroid = file('external/libetpan/build-android')
def pEpEngineAndroid = new File(new File(pEpEngineSrc), 'build-android')
def pEpEngineDB = new File(new File(pEpEngineSrc), 'db') def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
buildscript { buildscript {
@ -25,7 +24,7 @@ allprojects {
jcenter() jcenter()
} }
} }
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
@ -44,7 +43,7 @@ android {
} }
} }
} }
sourceSets { sourceSets {
main { main {
@ -90,7 +89,6 @@ android {
ext { ext {
//FIXME> improve that build to be able to build without the need of unzip deps // Get rid of unziping //FIXME> improve that build to be able to build without the need of unzip deps // Get rid of unziping
// pEpEngineZip = new File(pEpEngineAndroid, 'pEpEngine-android-1.zip')
libEtPanZip = new File(libetpanAndroid, 'libetpan-android-1.zip') libEtPanZip = new File(libetpanAndroid, 'libetpan-android-1.zip')
} }
@ -126,20 +124,19 @@ android {
commandLine 'make', 'clean-assets', 'PEP_PACKAGE_NAME='+pEpAppPackageName commandLine 'make', 'clean-assets', 'PEP_PACKAGE_NAME='+pEpAppPackageName
} }
// unzip some of the dependencies // unzip some of the dependencies
task unzipDeps(type: Copy) { task unzipDeps(type: Copy) {
//from zipTree(pEpEngineZip)
from zipTree(libEtPanZip) from zipTree(libEtPanZip)
into file("${buildDir}") into file("${buildDir}")
} }
// builds pEpEnginge's system.db // builds pEpEnginge's system.db
task buildpEpEngineSystemDB(type:Exec) { task buildpEpEngineSystemDB(type:Exec) {
workingDir pEpEngineDB workingDir pEpEngineDB
commandLine 'make', 'system.db' commandLine 'make', 'system.db'
} }
// copy pEpEnginge's system.db to asset // copy pEpEnginge's system.db to asset
task cpDBAssets(type: Copy) { task cpDBAssets(type: Copy) {
from file(new File(pEpEngineDB, 'system.db')) from file(new File(pEpEngineDB, 'system.db'))
into 'assets' into 'assets'

6
src/gen_cpp_Engine.ysl2

@ -10,9 +10,9 @@ tstylesheet {
template "interface" document("org_pEp_jniadapter_{@name}.cc", "text") template "interface" document("org_pEp_jniadapter_{@name}.cc", "text")
|| ||
#include <assert.h> #include <assert.h>
#include <pEp/message_api.h> #include <message_api.h>
#include <pEp/blacklist.h> #include <blacklist.h>
#include <pEp/openpgp_compat.h> #include <openpgp_compat.h>
#include "org_pEp_jniadapter_«@name».h" #include "org_pEp_jniadapter_«@name».h"
#include "throw_pEp_exception.hh" #include "throw_pEp_exception.hh"
#include "jniutils.hh" #include "jniutils.hh"

2
src/gen_cpp_Message.ysl2

@ -16,7 +16,7 @@ tstylesheet {
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <pEp/«@name».h> #include <«@name».h>
#include "jniutils.hh" #include "jniutils.hh"
#include "org_pEp_jniadapter_«$jname».h" #include "org_pEp_jniadapter_«$jname».h"

6
src/jniutils.hh

@ -4,9 +4,9 @@
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
#include <jni.h> #include <jni.h>
#include <pEp/stringpair.h> #include <stringpair.h>
#include <pEp/identity_list.h> #include <identity_list.h>
#include <pEp/bloblist.h> #include <bloblist.h>
#if 0 // Enable if log needed #if 0 // Enable if log needed
#include <android/log.h> #include <android/log.h>

6
src/org_pEp_jniadapter_AbstractEngine.cc

@ -4,9 +4,9 @@
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include <pthread.h> #include <pthread.h>
#include <pEp/keymanagement.h> #include <keymanagement.h>
#include <pEp/message_api.h> #include <message_api.h>
#include <pEp/sync.h> #include <sync.h>
#include "throw_pEp_exception.hh" #include "throw_pEp_exception.hh"
#include "jniutils.hh" #include "jniutils.hh"

Loading…
Cancel
Save