From: abitha.s <abitha.s@samsung.com>
Date: Wed, 12 Oct 2016 13:18:51 +0000 (+0530)
Subject: Added changes to remove build warning while building NS Jni Common files
X-Git-Tag: 1.3.0~1055^2~70
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ca715130d210337381369b8d3c65283a9ab6ae4;p=platform%2Fupstream%2Fiotivity.git

Added changes to remove build warning while building NS Jni Common files

Change-Id: I0631be24a2cdfeedaae61a02fb351f047f834ae7
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/notification/cpp-wrapper/consumer/SConscript b/service/notification/cpp-wrapper/consumer/SConscript
index ec46434..e18ce7c 100755
--- a/service/notification/cpp-wrapper/consumer/SConscript
+++ b/service/notification/cpp-wrapper/consumer/SConscript
@@ -103,6 +103,8 @@ notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wra
 # Source files and Targets for Consumer Jni
 ######################################################################
 if target_os == 'android':
+	Import('notificationJniCommonSharedObjs')
+
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../extlibs/boost/boost_1_58_0'])
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../android/android_api/base/jni'])
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/common'])
@@ -114,7 +116,7 @@ if target_os == 'android':
 
 	notification_consumer_jni_src = [
 		env.Glob('../../android/notification-service/src/main/jni/consumer/*.cpp'),
-		env.Glob('../../android/notification-service/src/main/jni/common/*.cpp')]
+		notificationJniCommonSharedObjs]
 
 	consumerJni = notification_jni_consumer_env.SharedLibrary('notification_consumer_jni', notification_consumer_jni_src)
 	notification_jni_consumer_env.InstallTarget(consumerJni, 'libnotification_consumer_jni')
diff --git a/service/notification/cpp-wrapper/provider/SConscript b/service/notification/cpp-wrapper/provider/SConscript
index c64765f..956830e 100755
--- a/service/notification/cpp-wrapper/provider/SConscript
+++ b/service/notification/cpp-wrapper/provider/SConscript
@@ -125,10 +125,15 @@ if target_os == 'android':
 		'notification_provider_wrapper'
 		])
 
+	notificationJniCommonSharedObjs = [
+		notification_jni_provider_env.SharedObject('../../android/notification-service/src/main/jni/common/JniNotificationCommon.cpp')]
+
 	notification_provider_jni_src = [
 		env.Glob('../../android/notification-service/src/main/jni/provider/*.cpp'),
-		env.Glob('../../android/notification-service/src/main/jni/common/*.cpp')]
+		notificationJniCommonSharedObjs]
 
 	providerJni = notification_jni_provider_env.SharedLibrary('notification_provider_jni', notification_provider_jni_src)
 	notification_jni_provider_env.InstallTarget(providerJni, 'libnotification_provider_jni')
 	notification_jni_provider_env.UserInstallTargetLib(providerJni, 'libnotification_provider_jni')
+
+	Export('notificationJniCommonSharedObjs')