projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
android
/
android_api
/
base
/
jni
/
Android.mk
diff --git
a/android/android_api/base/jni/Android.mk
b/android/android_api/base/jni/Android.mk
index
59400f2
..
4210502
100644
(file)
--- a/
android/android_api/base/jni/Android.mk
+++ b/
android/android_api/base/jni/Android.mk
@@
-3,6
+3,7
@@
TARGET_ARCH_ABI := $(APP_ABI)
SECURED := $(SECURE)
WITH_CLOUD := $(WITH_CLOUD)
WITH_TCP := $(WITH_TCP)
SECURED := $(SECURE)
WITH_CLOUD := $(WITH_CLOUD)
WITH_TCP := $(WITH_TCP)
+TCP_ADAPTER := $(WITH_TCP)
WITH_MQ_PUB := $(WITH_MQ_PUB)
WITH_MQ_SUB := $(WITH_MQ_SUB)
WITH_MQ_BROKER := $(WITH_MQ_BROKER)
WITH_MQ_PUB := $(WITH_MQ_PUB)
WITH_MQ_SUB := $(WITH_MQ_SUB)
WITH_MQ_BROKER := $(WITH_MQ_BROKER)
@@
-41,6
+42,12
@@
include $(PREBUILT_SHARED_LIBRARY)
ifeq ($(SECURED), 1)
include $(CLEAR_VARS)
OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
ifeq ($(SECURED), 1)
include $(CLEAR_VARS)
OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
+LOCAL_MODULE := libandroid-mbedtls
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libmbedtls.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
LOCAL_MODULE := libandroid-ocprovision
LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocprovision.so
include $(PREBUILT_SHARED_LIBRARY)
LOCAL_MODULE := libandroid-ocprovision
LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocprovision.so
include $(PREBUILT_SHARED_LIBRARY)
@@
-72,9
+79,15
@@
ifeq ($(WITH_CLOUD), 1)
endif
ifeq ($(WITH_TCP), 1)
endif
ifeq ($(WITH_TCP), 1)
- LOCAL_CPPFLAGS += -D__WITH_TLS__
+ LOCAL_CPPFLAGS += -D__WITH_TLS__ \
+ -DWITH_TCP
endif
endif
+ifeq ($(TCP_ADAPTER), 1)
+ LOCAL_CPPFLAGS += -DTCP_ADAPTER
+endif
+
+
MQ_FLAG = 0
ifeq ($(WITH_MQ_PUB), 1)
LOCAL_CFLAGS += -DWITH_MQ -DMQ_PUBLISHER
MQ_FLAG = 0
ifeq ($(WITH_MQ_PUB), 1)
LOCAL_CFLAGS += -DWITH_MQ -DMQ_PUBLISHER
@@
-129,14
+142,17
@@
ifeq ($(SECURED), 1)
JniSecureUtils.cpp \
JniProvisionResultListner.cpp \
JniPinCheckListener.cpp \
JniSecureUtils.cpp \
JniProvisionResultListner.cpp \
JniPinCheckListener.cpp \
- JniDisplayPinListener.cpp
+ JniDisplayPinListener.cpp \
+ JniDisplayVerifyNumListener.cpp \
+ JniConfirmNumListener.cpp
endif
ifeq ($(WITH_CLOUD), 1)
LOCAL_SRC_FILES += JniOcAccountManager.cpp
endif
endif
ifeq ($(WITH_CLOUD), 1)
LOCAL_SRC_FILES += JniOcAccountManager.cpp
endif
-ifeq ($(WITH_TCP), 1)
+ifeq ($(TCP_ADAPTER), 1)
+ LOCAL_SRC_FILES += JniKeepAliveListener.cpp
ifeq ($(SECURED), 1)
LOCAL_SRC_FILES += JniOcCloudProvisioning.cpp \
JniOcCloudResultListener.cpp \
ifeq ($(SECURED), 1)
LOCAL_SRC_FILES += JniOcCloudProvisioning.cpp \
JniOcCloudResultListener.cpp \
@@
-154,6
+170,7
@@
LOCAL_STATIC_LIBRARIES += android_cpp11_compat
ifeq ($(SECURED), 1)
LOCAL_STATIC_LIBRARIES += android-ocprovision
LOCAL_STATIC_LIBRARIES += android-ocpmapi
ifeq ($(SECURED), 1)
LOCAL_STATIC_LIBRARIES += android-ocprovision
LOCAL_STATIC_LIBRARIES += android-ocpmapi
+LOCAL_STATIC_LIBRARIES += android-mbedtls
endif
LOCAL_SHARED_LIBRARIES += android-rd
endif
LOCAL_SHARED_LIBRARIES += android-rd
@@
-173,6
+190,7
@@
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/cjson
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/tinycbor/tinycbor/src
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/cjson
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/tinycbor/tinycbor/src
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/mbedtls/mbedtls/include/
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../build_common/android/compatibility
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../build_common/android/compatibility
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include
LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/