From: Larry Sachs <larry.j.sachs@intel.com>
Date: Mon, 6 Mar 2017 22:47:49 +0000 (-0800)
Subject: [IOT-1887] Android apps fail to run
X-Git-Tag: 1.3.0~529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d581bc09055cfd805959e36e3f567f3b29562df;p=platform%2Fupstream%2Fiotivity.git

[IOT-1887] Android apps fail to run

Changed java/iotivity-android/build.gradle to copy libresource_directory.so
into the sample app apk files.

As a result of that change, the service/notification builds need to specfically
exclude that library.

Tested with running simple server/client apps on nexus 9.

Change-Id: I2143c37d424614e50a877f0c8c5153387f0a2b09
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17711
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
---

diff --git a/java/iotivity-android/build.gradle b/java/iotivity-android/build.gradle
index 75184ba..21d7fb3 100755
--- a/java/iotivity-android/build.gradle
+++ b/java/iotivity-android/build.gradle
@@ -137,6 +137,7 @@ task copyNativeLibs(type: Copy) {
         'liboc_logger.so',
         'liboctbstack.so',
         'liboc.so',
+        'libresource_directory.so',
         'libocstack-jni.so'
     ]
     if ("$SECURED" == '1')
diff --git a/service/notification/examples/android/NotiConsumerExample/app/build.gradle b/service/notification/examples/android/NotiConsumerExample/app/build.gradle
index 7e6dd9c..e4e47d3 100755
--- a/service/notification/examples/android/NotiConsumerExample/app/build.gradle
+++ b/service/notification/examples/android/NotiConsumerExample/app/build.gradle
@@ -10,6 +10,11 @@ android {
         pickFirst 'lib/x86/libocstack-jni.so'
         pickFirst 'lib/x86_64/libocstack-jni.so'
         pickFirst 'lib/arm64-v8a/libocstack-jni.so'
+        exclude 'lib/armeabi/libresource_directory.so'
+        exclude 'lib/armeabi-v7a/libresource_directory.so'
+        exclude 'lib/x86/libresource_directory.so'
+        exclude 'lib/x86_64/libresource_directory.so'
+        exclude 'lib/arm64-v8a/libresource_directory.so'
     }
 
     defaultConfig {
diff --git a/service/notification/examples/android/NotiProviderExample/app/build.gradle b/service/notification/examples/android/NotiProviderExample/app/build.gradle
index a1ae6e2..c6dcb72 100755
--- a/service/notification/examples/android/NotiProviderExample/app/build.gradle
+++ b/service/notification/examples/android/NotiProviderExample/app/build.gradle
@@ -10,6 +10,11 @@ android {
         pickFirst 'lib/x86/libocstack-jni.so'
         pickFirst 'lib/x86_64/libocstack-jni.so'
         pickFirst 'lib/arm64-v8a/libocstack-jni.so'
+        exclude 'lib/armeabi/libresource_directory.so'
+        exclude 'lib/armeabi-v7a/libresource_directory.so'
+        exclude 'lib/x86/libresource_directory.so'
+        exclude 'lib/x86_64/libresource_directory.so'
+        exclude 'lib/arm64-v8a/libresource_directory.so'
     }
 
     defaultConfig {