[IOT-1765] Fix for DT_SONAME warning messages in Android

Although the jira issue was against 1.2-rel, this fix is being
applied to master for inclusion in 1.3.

Change-Id: I81d7f6669c4ab4c41e1649c02021512da6fc7f3a
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17127
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

diff --git a/java/jni/SConscript b/java/jni/SConscript
index 83202cd..0790dad 100644 (file)
--- a/java/jni/SConscript
+++ b/java/jni/SConscript
@@ -75,6 +75,7 @@ if env.get('SECURED') == '1':
 
 if target_os == 'android':
        jni_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
+       jni_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libocstack-jni.so'])
        jni_env.AppendUnique(LIBS = ['gnustl_shared'])
 
        if not env.get('RELEASE'):

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 1aa6ad7..57bf1dd 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -195,6 +195,7 @@ if env.get('LOGGING'):
        lib_env.AppendUnique(CPPDEFINES=['TB_LOG'])
 
 if ca_os == 'android':
+       lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libca-interface.so'])
        lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
 
 if lib_env.get('SECURED') == '1':

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 57f1564..09f911f 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -107,6 +107,9 @@ else:
        provisioning_env.AppendUnique(CPPPATH = ['#/extlibs/sqlite3'])
        provisioning_src = provisioning_src + ['#/extlibs/sqlite3/sqlite3.c' ]
 
+if target_os in ['android']:
+       provisioning_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libocpmapi.so'])
+
 if target_os in ['windows', 'msys_nt', 'ios']:
        # octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll.
        provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src)

diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index 38e743c..069fc07 100644 (file)
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -58,6 +58,7 @@ if target_os not in ['windows']:
 
 if target_os == 'android':
        ocprovision_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
+       ocprovision_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libocprovision.so'])
        ocprovision_env.AppendUnique(LIBPATH = [ocprovision_env.get('BUILD_DIR')])
        ocprovision_env.AppendUnique(LIBS = ['oc', 'octbstack', 'ocpmapi', 'oc_logger', 'boost_thread', 'gnustl_shared', 'log'])