Move swig C build output to jni folder

I also renamed the placeholder README files to
.gitignore files.  I did this based on a stackoverflow
discusion reguarding placeholder files for empty
directories. README files should contain useful information
for developers.

Change-Id: I0e8db6300ec2fe4041e870341625d68e3c21b92c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29406Tested-by: IoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

port/android/Makefile-swig

@@ -40,7 +40,7 @@ SECURE ?= 1
 PKI ?= 1
 
 ROOT_DIR = ../..
-SWIG_DIR := ../../swig/java_lang
+SWIG_DIR := ../../swig/iotivity-lite-java/jni/
 OBJDIR ?= ./${ANDROID_HOST}obj
 MBEDTLS_DIR := $(ROOT_DIR)/deps/mbedtls
 

port/windows/vs2015/iotivity-lite-java/iotivity-lite-java.vcxproj

@@ -170,24 +170,24 @@
   <ItemGroup>
     <Text Include="ReadMe.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_api_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_clock_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_collection_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_endpoint_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_obt_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_pki_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_rep_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_storage_wrap.c" />
-    <ClCompile Include="..\..\..\..\swig\java_lang\oc_uuid_wrap.c" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IoTivity-Constrained.vcxproj">
       <Project>{1866d7a4-fc11-46ca-9377-3baa69d4bf58}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\swig\java_lang\oc_iotivity_lite_jni.h" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_api_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_clock_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_collection_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_endpoint_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_obt_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_pki_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_rep_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_storage_wrap.c" />
+    <ClCompile Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_uuid_wrap.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\swig\iotivity-lite-java\jni\oc_iotivity_lite_jni.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

swig/iotivity-lite-java/.gitignore

 /bin/
-/src/org/iotivity/*.java
 /src/org/iotivity/oc/*.java

swig/iotivity-lite-java/jni/.gitignore

+# Folder intentionally left empty
+# The jni wraper code will be placed in this directory by when swig build is run.
+*.c
+*.h
\ No newline at end of file

swig/iotivity-lite-java/libs/.gitignore

+# Folder intentionally left empty
+# If working in Eclipse IDE the iotivity-lite-jni shared library can be placed in this folder.
+*.dll
+*.so
\ No newline at end of file

swig/iotivity-lite-java/libs/README-libs.md

-If working in Eclipse IDE the iotivity-lite-jni shared library can be placed in this folder.

swig/iotivity-lite-java/src/org/iotivity/.gitignore

+# Folder intentionally left empty.
+# It will be populated when the SWIG build scripts have been run.
+*.java
\ No newline at end of file

swig/iotivity-lite-java/src/org/iotivity/README.md

-Folder intentionally left empty.
-
-It will be populated when the SWIG build scripts have been run.
\ No newline at end of file

swig/java_lang/build-jni-so.sh

@@ -7,23 +7,23 @@ rm -rf ./obj
 mkdir ./obj
 
 # compile swig generated C/C++ files
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address oc_api_wrap.c -o ./obj/oc_api_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address ../iotivity-lite-java/jni/oc_api_wrap.c -o ./obj/oc_api_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../../ -I../../include -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function oc_storage_wrap.c  -o ./obj/oc_storage_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../../ -I../../include -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function ../iotivity-lite-java/jni/oc_storage_wrap.c  -o ./obj/oc_storage_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../../ -I../../include -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing oc_clock_wrap.c  -o ./obj/oc_clock_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../../ -I../../include -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing ../iotivity-lite-java/jni/oc_clock_wrap.c  -o ./obj/oc_clock_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-address -Wno-unused-function -Wno-unused-variable oc_collection_wrap.c  -o ./obj/oc_collection_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-address -Wno-unused-function -Wno-unused-variable ../iotivity-lite-java/jni/oc_collection_wrap.c  -o ./obj/oc_collection_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address oc_obt_wrap.c -o ./obj/oc_obt_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address ../iotivity-lite-java/jni/oc_obt_wrap.c -o ./obj/oc_obt_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address oc_endpoint_wrap.c -o ./obj/oc_endpoint_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address ../iotivity-lite-java/jni/oc_endpoint_wrap.c -o ./obj/oc_endpoint_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address oc_pki_wrap.c -o ./obj/oc_pki_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address ../iotivity-lite-java/jni/oc_pki_wrap.c -o ./obj/oc_pki_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address oc_rep_wrap.c -o ./obj/oc_rep_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-unused-variable -Wno-sign-compare -Wno-address ../iotivity-lite-java/jni/oc_rep_wrap.c -o ./obj/oc_rep_wrap.o
 
-gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address -Wno-unused-variable oc_uuid_wrap.c -o ./obj/oc_uuid_wrap.o
+gcc -c -fPIC -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -ffreestanding -Os -fno-stack-protector -ffunction-sections -fdata-sections -fno-reorder-functions -fno-defer-pop -fno-strict-overflow -I"$JAVA_HOME/include/" -I"$JAVA_HOME/include/linux/" -I../.. -I../../include/ -I../../port/ -I../../port/linux/ -I../../util/ -I../../deps/tinycbor/src/ -Wall -Wextra -Werror -pedantic -D__OC_RANDOM -DOC_CLIENT -DOC_SERVER -DOC_IPV4 -DOC_DYNAMIC_ALLOCATION -DOC_DEBUG -DOC_SECURITY -g -O0 -Wno-unused-parameter -Wno-strict-aliasing -Wno-unused-function -Wno-sign-compare -Wno-address -Wno-unused-variable ../iotivity-lite-java/jni/oc_uuid_wrap.c -o ./obj/oc_uuid_wrap.o
 
 # create shared library
 gcc -shared ./obj/*.o ../../port/linux/obj/*.o ../../port/linux/obj/client_server/*.o  -lm -lpthread -lrt -o libiotivity-lite-jni.so

swig/java_lang/build_swig.sh

 #!/bin/sh
 
-rm *.c
+#rm *.c
 #rm *.cxx
+rm ../iotivity-lite-java/jni/*.h
+rm ../iotivity-lite-java/jni/*.c
 rm ../iotivity-lite-java/src/org/iotivity/*.java
 rm ../iotivity-lite-java/src/org/iotivity/oc/*.java
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_obt.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_obt_wrap.c ../swig_interfaces/oc_obt.i
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_uuid.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_uuid_wrap.c ../swig_interfaces/oc_uuid.i
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_collection.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_collection_wrap.c ../swig_interfaces/oc_collection.i
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_endpoint.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_endpoint_wrap.c ../swig_interfaces/oc_endpoint.i
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_pki.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_pki_wrap.c ../swig_interfaces/oc_pki.i
 
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ ../swig_interfaces/oc_rep.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../include/ -o ../iotivity-lite-java/jni/oc_rep_wrap.c ../swig_interfaces/oc_rep.i
 
 if [ "$#" -ge 1 ] && [ "$1" = "linux" ]
 then
   echo Building wrapper for linux clock
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/linux ../swig_interfaces/oc_api.i
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -D__linux__ -I../.. -I../../port/linux -o oc_clock_wrap.c ../swig_interfaces/oc_clock.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/linux -o ../iotivity-lite-java/jni/oc_api_wrap.c ../swig_interfaces/oc_api.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -D__linux__ -I../.. -I../../port/linux -o ../iotivity-lite-java/jni/oc_clock_wrap.c ../swig_interfaces/oc_clock.i
 elif [ "$#" -ge 1 ] && [ "$1" = "android" ]
 then
   echo Building wrapper for android clock
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/android ../swig_interfaces/oc_api.i
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -D__linux__ -I../.. -I../../port/android -o oc_clock_wrap.c ../swig_interfaces/oc_clock.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/android -o ../iotivity-lite-java/jni/oc_api_wrap.c ../swig_interfaces/oc_api.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -D__linux__ -I../.. -I../../port/android -o ../iotivity-lite-java/jni/oc_clock_wrap.c ../swig_interfaces/oc_clock.i
 else
   echo Building wrapper for windows clock
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/windows ../swig_interfaces/oc_api.i
-  swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../port/windows ../swig_interfaces/oc_clock.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../.. -I../../include/ -I../../port/windows -o ../iotivity-lite-java/jni/oc_api_wrap.c ../swig_interfaces/oc_api.i
+  swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -D_WIN32 -I../.. -I../../port/windows -o ../iotivity-lite-java/jni/oc_clock_wrap.c ../swig_interfaces/oc_clock.i
 fi
 
-#swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ ../swig_interfaces/oc_ri.i
-swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../port/ ../swig_interfaces/oc_storage.i
+#swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -o ../iotivity-lite-java/jni/oc_ri_wrap.c ../swig_interfaces/oc_ri.i
+swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../port/ -o ../iotivity-lite-java/jni/oc_storage_wrap.c  ../swig_interfaces/oc_storage.i
 
-#swig -java -package org.iotivity -outcurrentdir -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../security/ ../swig_interfaces/oc_acl.i
+#swig -java -package org.iotivity -outdir ../iotivity-lite-java/src/org/iotivity/ -I../../security/ -o ../iotivity-lite-java/jni/oc_acl_wrap.c ../swig_interfaces/oc_acl.i
 
+cp *.h ../iotivity-lite-java/jni/ 
 cp ../oc_java/*.java ../iotivity-lite-java/src/org/iotivity/
 mkdir -p ../iotivity-lite-java/src/org/iotivity/oc/
 cp ../oc_java/oc/*.java ../iotivity-lite-java/src/org/iotivity/oc/

swig/java_lang/clean_swig.sh

 #!/bin/sh
 
-rm *.c
-rm *.cxx
-rm ../iotivity-lite-java/src/org/iotivity/*.java
\ No newline at end of file
+rm ../iotivity-lite-java/jni/*.h
+rm ../iotivity-lite-java/jni/*.c
+rm ../iotivity-lite-java/src/org/iotivity/*.java
+rm ../iotivity-lite-java/src/org/iotivity/oc/*.java
\ No newline at end of file