[IOT-3023] Easy Setup Missing Library for x86 73/26573/3
authorLarry Sachs <larry.j.sachs@intel.com>
Tue, 24 Jul 2018 20:44:38 +0000 (13:44 -0700)
committerNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tue, 24 Jul 2018 23:53:15 +0000 (23:53 +0000)
The libeasysetup-jni.so and libESMediatorRich.so libraries
are now being placed in the correct directories for inclusion
into the apk file for x86 and x86_64 builds.

Change-Id: I7ed76995ace68ea16e13f083b32606a1b63a2cd6
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle

index 3ba8419..0c3a430 100644 (file)
@@ -64,8 +64,8 @@ dependencies {
 //otherwise remove the dependsOn part and run ./gradlew buildNative from the command line
 task copyNativeLibs(type: Copy, dependsOn: 'buildNative') {
     dependsOn 'buildNative'
-    from(new File('src/main/libs/armeabi')) { include '**/*.so' exclude '**/libgnustl_shared.so', '**/liboc.so', '**/libocstack-jni.so'}
-    into new File(buildDir, 'native-libs/armeabi')
+    from(new File('src/main/libs')) { include '**/*.so' exclude '**/libgnustl_shared.so', '**/liboc.so', '**/libocstack-jni.so'}
+    into new File(buildDir, 'native-libs')
 }
 
 tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyNativeLibs }