import liblsl for android only once

Author: tstenner

AndroidStudio/CMakeLists.txt

@@ -1,60 +1,34 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "edu.ucsd.sccn.receivestringmarkers"
         minSdkVersion 17
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                cppFlags "-std=c++11 -frtti -fexceptions"
-            }
-        }
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    externalNativeBuild {
-        cmake {
-            path "../CMakeLists.txt"
-        }
-    }
 
     dexOptions {
         javaMaxHeapSize "2048m"
     }
-
-    sourceSets {
-        main {
-            java.srcDirs += '../../../liblsl-Java/src'
-        }
-    }
 }
 
 dependencies {
-    compile fileTree(dir: '../libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: '../libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
-}
-
-//copy native libraries to per project location
-task copyJniLibs(type: Copy) {
-    from '../jniLibs'
-    into 'src/main/jniLibs'
+    implementation project(':liblsl-Java')
+    implementation 'com.android.support:appcompat-v7:28.+'
+    testImplementation 'junit:junit:4.12'
 }
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn(copyJniLibs)
-}
-clean.dependsOn 'cleanCopyJniLibs'
-

AndroidStudio/ReceiveStringMarkers/build.gradle

@@ -1,60 +1,33 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "edu.ucsd.sccn.sendstringmarkers"
         minSdkVersion 17
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                cppFlags "-std=c++11 -frtti -fexceptions"
-            }
-        }
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    externalNativeBuild {
-        cmake {
-            path "../CMakeLists.txt"
-        }
-    }
-
-    dexOptions {
+        dexOptions {
         javaMaxHeapSize "2048m"
     }
-
-    sourceSets {
-        main {
-            java.srcDirs += '../../../liblsl-Java/src'
-        }
-    }
 }
 
 dependencies {
-    compile fileTree(dir: '../libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: '../libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
-}
-
-//copy native libraries to per project location
-task copyJniLibs(type: Copy) {
-    from '../jniLibs'
-    into 'src/main/jniLibs'
+    implementation 'com.android.support:appcompat-v7:28.+'
+    implementation project(':liblsl-Java')
+    testImplementation 'junit:junit:4.12'
 }
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn(copyJniLibs)
-}
-clean.dependsOn 'cleanCopyJniLibs'
-

AndroidStudio/SendStringMarkers/build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

AndroidStudio/build.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

AndroidStudio/gradle/wrapper/gradle-wrapper.properties

@@ -1,34 +1,26 @@
-This is currently the most robust and straightforward way of making Android apps that incorporate LSL. These instructions apply to Android Studio 3.1.2. You will need to get jna-4.2.2.jar (from https://mvnrepository.com/artifact/net.java.dev.jna/jna/4.2.2) and put it in LSL/liblsl-Android/AndroidStudio/libs. You will need to get the native jna libraries from https://github.com/java-native-access/jna/tree/4.2.2/lib/native. Select branch 4.2.2 and download android-*.jar. Extract each of these jars, using 7-zip or similar, and create the following directory tree:
-LSL/liblsl-Android/AndroidStudio/jniLibs
-    arm64-v8a
-        libjnidispatch.so
-    armeabi
-        libjnidispatch.so
-    armeabi-v7a
-        libjnidispatch.so
-    mips
-        libjnidispatch.so
-    mips64
-        libjnidispatch.so
-    x86
-        libjnidispatch.so
-    x86_64
-        libjnidispatch.so
-
-Yes the platform names are different in the jar files than in the required the directory structure, and yes the names are important. If you do this incorrectly, you get errors related to "missing libjnidispatch.so".
-
-If you get errors related to native, built in functions such as fgetpos and fsetpos in cstdio, this implies a problem with the version of the ndk that you are using (revision 15c and 16b are broken for several platforms). Download Revision 14b from https://developer.android.com/ndk/downloads/older_releases.html to a volume with a lot of space (it is 2.36 GB). In Android Studio, go to File -> Project Structure -> SDK Location -> Android NDK location and set the path to point at android-ndk-r14b.
-
-To run, select the desired module from the list box the the left of the green arrow, and click the green arrow.
-
-The majority of the native build instructions are in CMakeLists.txt, with some in the project build.gradle files.
-
-At this point, every module rebuilds its own version of liblsl.so. Hopefully Android Studio will one day support building a purely native library without redundancy.
-
-If you would like to use LSL in an android app built in a different way, it is recommended that you build one project (such as ReceiveStringMarkers) and extract the needed compiled library files from the .apk file (using 7-zip or similar).
-
-To make other Apps in Android Studio, the easiest way is to exit Android Studio, copy the SendStringMarkers folder and change every reference to SendStringMarkers in the copied folder to a new name (using a text editor).
-
-To see more examples of Java with LSL, look in LSL/liblsl-Java. Those examples should copy of to Android with minimal effort.
-
-
+This is currently the most robust and straightforward way of making Android apps that incorporate LSL. These instructions apply to Android Studio 3.2.0. 
+
+jna 4.5.0 is automatically downloaded and included, so just in case something goes wrong you'll have to make sure your APK has `libjnidispatch.so` and `liblsl.so` in all CPU architecture dependent subdirectories of `lib`, e.g.
+
+[your apk]/lib
+    arm64-v8a
+        libjnidispatch.so
+        liblsl.so
+    armeabi
+        libjnidispatch.so
+        liblsl.so
+...
+
+To run, select the desired module from the list box the the left of the green arrow, and click the green arrow.
+
+The majority of the native build instructions are in `../liblsl-Java/build.gradle` and `../liblsl/CMakeLists.txt`.
+
+At this point, liblsl.so is built once for each target cpu architecture.
+
+If you would like to use LSL in an android app built in a different way, it is recommended that you build one project (such as ReceiveStringMarkers) and extract the needed compiled library files from the .apk file (using 7-zip or similar).
+
+To make other Apps in Android Studio, the easiest way is to exit Android Studio, copy the SendStringMarkers folder and change every reference to SendStringMarkers in the copied folder to a new name (using a text editor).
+
+To see more examples of Java with LSL, look in LSL/liblsl-Java. Those examples should copy of to Android with minimal effort.
+
+

AndroidStudio/readme.txt

@@ -1 +1,6 @@
-include ':ReceiveStringMarkers', ':SendStringMarkers'
+include ':ReceiveStringMarkers'
+include ':SendStringMarkers'
+
+// Tell gradle where to find liblsl-Java
+include 'liblsl-Java'
+project(':liblsl-Java').projectDir = new File('../../liblsl-Java')