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>
'liboc_logger.so',\r
'liboctbstack.so',\r
'liboc.so',\r
+ 'libresource_directory.so',\r
'libocstack-jni.so'\r
]\r
if ("$SECURED" == '1')\r
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 {
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 {