Zero-byte stubs for unsupported architectures (getodk#3108)

rral0 · May 29, 2019 · 0eee1d8 · 0eee1d8
1 parent ad88868
commit 0eee1d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -148,6 +148,10 @@ android {
         pickFirst 'META-INF/services/com.fasterxml.jackson.core.ObjectCodec'
         pickFirst 'META-INF/services/javax.ws.rs.ext.MessageBodyReader'
         pickFirst 'META-INF/services/javax.ws.rs.ext.MessageBodyWriter'
+
+        exclude 'lib/arm64-v8a/libmapbox-gl.so'
+        exclude 'lib/x86/libmapbox-gl.so'
+        exclude 'lib/x86_64/libmapbox-gl.so'
     }
 
     compileOptions {
@@ -183,7 +187,7 @@ configurations.all {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: '*.jar')
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'com.google.android.material:material:1.1.0-alpha05'

diff --git a/collect_app/libs/nbi-stubs-1.0.0.aar b/collect_app/libs/nbi-stubs-1.0.0.aar