Fixed conditional Loading of ocprovision

Make build flag to propagate from gradle env to java runtime

Change-Id: I5e343778fe48d272cb025fddf64a7439276d75f6
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7425
Reviewed-by: Ashwini  Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle
index 4ba4b8b..ec30b71 100755 (executable)
--- a/android/android_api/base/build.gradle
+++ b/android/android_api/base/build.gradle
@@ -42,6 +42,7 @@ android {
         targetSdkVersion 21\r
         versionCode 1\r
         versionName "1.0"\r
+        buildConfigField 'String', 'SECURED', '"' + SECURED + '"'\r
     }\r
     buildTypes {\r
         release {\r

diff --git a/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java b/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
index d0aa37d..d382672 100644 (file)
--- a/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
+++ b/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
@@ -23,6 +23,7 @@
 package org.iotivity.base;
 
 import org.iotivity.ca.CaInterface;
+import org.iotivity.base.BuildConfig;
 
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -40,7 +41,10 @@ public final class OcPlatform {
         System.loadLibrary("octbstack");
         System.loadLibrary("connectivity_abstraction");
         System.loadLibrary("oc");
-        //System.loadLibrary("ocprovision");
+        if (BuildConfig.SECURED.equals("1"))
+        {
+            System.loadLibrary("ocprovision");
+        }
         System.loadLibrary("ocstack-jni");
     }