Commit fc3c5ca0 authored by Poovizhi's avatar Poovizhi Committed by Uze Choi

[IOT-1955] Notification service fails to load libca-interface.so

Changes are made to add libca-interface.so to service/notification. This library
requires libresource_directory.so and hence added that.
Changes added in build.gradle to avoid duplicates.

Change-Id: I0a40aa9fdb726fb7a1e778ff63155d78ffde21f6
Signed-off-by: default avatarPoovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18133Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
parent 8113caa8
......@@ -29,6 +29,13 @@ LOCAL_MODULE := res_directory
LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libresource_directory.so
include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS)
OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
LOCAL_MODULE := ca-interface
LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libca-interface.so
include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := notification_consumer_jni
LOCAL_CPPFLAGS := -std=c++0x -frtti -fexceptions
......
......@@ -10,11 +10,16 @@ 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'
pickFirst 'lib/armeabi/libca-interface.so'
pickFirst 'lib/armeabi-v7a/libca-interface.so'
pickFirst 'lib/x86/libca-interface.so'
pickFirst 'lib/x86_64/libca-interface.so'
pickFirst 'lib/arm64-v8a/libca-interface.so'
pickFirst 'lib/armeabi/libresource_directory.so'
pickFirst 'lib/armeabi-v7a/libresource_directory.so'
pickFirst 'lib/x86/libresource_directory.so'
pickFirst 'lib/x86_64/libresource_directory.so'
pickFirst 'lib/arm64-v8a/libresource_directory.so'
}
defaultConfig {
......
......@@ -10,11 +10,16 @@ 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'
pickFirst 'lib/armeabi/libca-interface.so'
pickFirst 'lib/armeabi-v7a/libca-interface.so'
pickFirst 'lib/x86/libca-interface.so'
pickFirst 'lib/x86_64/libca-interface.so'
pickFirst 'lib/arm64-v8a/libca-interface.so'
pickFirst 'lib/armeabi/libresource_directory.so'
pickFirst 'lib/armeabi-v7a/libresource_directory.so'
pickFirst 'lib/x86/libresource_directory.so'
pickFirst 'lib/x86_64/libresource_directory.so'
pickFirst '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