Merge branch '1.3-rel' (5a1209c) 79/23479/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 2 Dec 2017 09:02:07 +0000 (10:02 +0100)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 4 Dec 2017 14:27:15 +0000 (14:27 +0000)
Relate-to:
        https://gerrit.iotivity.org/gerrit/#/c/23505/

Conflicts:
auto_build.py
build_common/tools/UnpackAll.py
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c

Change-Id: Id698f81a3ff115d6f31021bbe5fc2c9a325373e8
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
24 files changed:
1  2 
.gitignore
auto_build.py
java/jni/JniCaInterface.c
java/jni/JniOcSecureResource.cpp
resource/csdk/resource-directory/samples/rd_publishingClient.cpp
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/resource-directory/unittests/rddatabase.cpp
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/include/experimental/doxmresource.h
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/srmutility.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditordoxm.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicresourcedirectory.c
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/resourcehandler.c

diff --cc .gitignore
Simple merge
diff --cc auto_build.py
@@@ -137,9 -137,8 +137,9 @@@ def build_linux_secured(flag, extra_opt
      call_scons(build_options, extra_option_str)
  
  def build_linux_full(flag, extra_option_str):
-     print ("*********** Build for linux with Security *************")
+     print ("*********** Build for linux with full features *************")
      build_options = {
 +                        'BUILD_JAVA':1,
                          'MULTIPLE_OWNER':1,
                          'RELEASE':flag,
                          'SECURED':1,
Simple merge
Simple merge
Simple merge