[IOT-1392] Fix Android build for SECURE=0 and WITH_TCP=1 47/12847/2
authorjihwanseo <jihwan.seo@samsung.com>
Tue, 4 Oct 2016 10:09:23 +0000 (15:39 +0530)
committerRick Bell <richard.s.bell@intel.com>
Fri, 14 Oct 2016 00:59:06 +0000 (00:59 +0000)
Change-Id: Ia4423b2ad9b2f0d38f95050aea5380d4bde70fae
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12761
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit ca322622fe08d67f39ae7b491038c1d6f040b8d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12847
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
android/android_api/base/jni/Android.mk

index 276b504..aabb512 100644 (file)
@@ -130,11 +130,12 @@ ifeq ($(WITH_CLOUD), 1)
 endif\r
 \r
 ifeq ($(WITH_TCP), 1)\r
+ifeq ($(SECURED), 1)\r
     LOCAL_SRC_FILES +=  JniOcCloudProvisioning.cpp \\r
                         JniOcCloudResultListener.cpp \\r
                         JniGetAclIdByDeviceListener.cpp\r
 endif\r
-\r
+endif\r
 \r
 LOCAL_LDLIBS := -llog\r
 LOCAL_STATIC_LIBRARIES := android-oc\r