Commit 6d581bc0 authored by Larry Sachs's avatar Larry Sachs Committed by Rick Bell

[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's avatarLarry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17711Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarjihwan seo <jihwan.seo@samsung.com>
Reviewed-by: default avatarJaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Reviewed-by: default avatarRick Bell <richard.s.bell@intel.com>
parent 288a6c07
......@@ -137,6 +137,7 @@ task copyNativeLibs(type: Copy) {
'liboc_logger.so',
'liboctbstack.so',
'liboc.so',
'libresource_directory.so',
'libocstack-jni.so'
]
if ("$SECURED" == '1')
......
......@@ -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 {
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment