Sconscript and Android sample app update

1) Sconscript update  to build android code
2)  onProviderChanged callback name update in consumer sample app

Change-Id: Ic74bf7315f31b734cb854d4e0b3d59a01420d74d
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index ba2db6c..ab866e8 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -120,8 +120,8 @@ if target_os == 'linux':
 SConscript('examples/SConscript')
 
 # Go to build jni
-#if target_os == 'android':
-#    SConscript('android/SConscript')
+if target_os == 'android':
+    SConscript('android/SConscript')
 
 # Go to build c++ wrapper
 SConscript('cpp-wrapper/SConscript')

diff --git a/service/notification/cpp-wrapper/SConscript b/service/notification/cpp-wrapper/SConscript
index 81316e3..e3b4d90 100755 (executable)
--- a/service/notification/cpp-wrapper/SConscript
+++ b/service/notification/cpp-wrapper/SConscript
@@ -18,6 +18,9 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+Import('env')
+target_os = env.get('TARGET_OS')
+
 # build producer notification wrapper
 SConscript('provider/SConscript')
 
@@ -28,4 +31,5 @@ SConscript('consumer/SConscript')
 SConscript('examples/linux/SConscript')
 
 # Go to build Unit test
-SConscript('unittest/SConscript')
\ No newline at end of file
+if target_os == 'linux':
+    SConscript('unittest/SConscript')

diff --git a/service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java b/service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java
index f953507..eb0a6cb 100755 (executable)
--- a/service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java
+++ b/service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java
@@ -39,7 +39,7 @@ import java.util.HashMap;
 \r
 public class ConsumerProxy\r
     implements ConsumerService.OnProviderDiscoveredListner,\r
-    ConsumerService.OnSubscriptionAcceptedListener,\r
+    ConsumerService.OnProviderChangedListener,\r
     Provider.OnMessageReceivedListner, Provider.OnSyncInfoReceivedListner\r
 {\r
 \r
@@ -232,7 +232,7 @@ public class ConsumerProxy
     }\r
 \r
     @Override\r
-    public void onSubscriptionAccepted(Provider provider)\r
+    public void onProviderChanged(Provider provider , ConsumerService.Response response)\r
     {\r
         Log.i(TAG, "onSubscriptionAccepted");\r
 \r

diff --git a/service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-debug/iotivity-armeabi-notification-service-debug.aar b/service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-debug/iotivity-armeabi-notification-service-debug.aar
deleted file mode 100755 (executable)
index 20b37e6..0000000
Binary files a/service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-debug/iotivity-armeabi-notification-service-debug.aar and /dev/null differ

diff --git a/service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-debug/iotivity-base-armeabi-debug.aar b/service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-debug/iotivity-base-armeabi-debug.aar
deleted file mode 100755 (executable)
index 18802ee..0000000
Binary files a/service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-debug/iotivity-base-armeabi-debug.aar and /dev/null differ