Make SECURED flag propagate as integer to BuildConfig

in android build for conditionally loading ocprovision.

Removed propagtion as String.
Valid values on Command line for SECURED flag is '0' or '1'.

Change-Id: I45708ee54ae9bd19fa17bd49d24b49b2811e82c5
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7485
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle
index 7a6e279..7deb01c 100755 (executable)
--- a/android/android_api/base/build.gradle
+++ b/android/android_api/base/build.gradle
@@ -42,7 +42,7 @@ android {
         targetSdkVersion 21\r
         versionCode 1\r
         versionName "1.1"\r
-        buildConfigField 'String', 'SECURED', '"' + SECURED + '"'\r
+        buildConfigField 'int', '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 d382672..c8678ff 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
@@ -41,7 +41,7 @@ public final class OcPlatform {
         System.loadLibrary("octbstack");
         System.loadLibrary("connectivity_abstraction");
         System.loadLibrary("oc");
-        if (BuildConfig.SECURED.equals("1"))
+        if (0 != BuildConfig.SECURED)
         {
             System.loadLibrary("ocprovision");
         }