Remove patches

parent f950cc1a
......@@ -53,16 +53,11 @@ The steps required to build the binary of the IoTivity-lite Android API is shown
```
git checkout swig
```
2. Apply all patchs of the OTGC in IoTivity-lite
```
git apply <otgc-linux>/extlibs/patchs/fix_swig_flags.patch
git apply <otgc-linux>/extlibs/patchs/ignore_cloud_discover_resources.patch
```
3. Go to the **android** directory.
2. Go to the **android** directory.
```
cd <iotivity-lite>/port/android
```
4. Execute the command to build the library.
3. Execute the command to build the library.
```
make NDK_HOME=<ndk-directory> ANDROID_API=21 DEBUG=1 SECURE=1 IPV4=1 TCP=0 PKI=1 DYNAMIC=1 CLOUD=0 JAVA=1 IDD=1
```
......
diff --git a/swig/Makefile b/swig/Makefile
index 8c42bd3c..83321526 100644
--- a/swig/Makefile
+++ b/swig/Makefile
@@ -77,6 +77,7 @@ endif
ifneq ($(SECURE),0)
EXTRA_FLAG += -DOC_SECURITY
+ SWIG_CFLAG += -DOC_SECURITY
endif
ifeq ($(IDD), 1)
@@ -85,6 +86,7 @@ endif
ifneq ($(PKI),0)
EXTRA_FLAG += -DOC_PKI
+ SWIG_CFLAG += -DOC_PKI
endif
ifeq ($(TCP),1)
diff --git a/swig/swig_interfaces/oc_cloud.i b/swig/swig_interfaces/oc_cloud.i
index 96efda20..dfb825ed 100644
--- a/swig/swig_interfaces/oc_cloud.i
+++ b/swig/swig_interfaces/oc_cloud.i
@@ -331,4 +331,6 @@ int jni_cloud_provision_conf_resource(oc_cloud_context_t *ctx,
}
%}
-%include "oc_cloud.h"
\ No newline at end of file
+%ignore oc_cloud_discover_resources;
+
+%include "oc_cloud.h"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment