target_os = env.get('TARGET_OS')
target_arch = env.get('TARGET_ARCH')
src_dir = env.get('SRC_DIR')
+cur_dir = Dir('.').abspath
######################################################################
# Generate iotivity_config.h using presence of headers
######################################################################
-config_h_file_path = os.path.join(src_dir, 'resource', 'c_common',
- 'iotivity_config.h')
+
+config_h_file_path = os.path.join(cur_dir, 'iotivity_config.h')
if (os.path.exists(config_h_file_path)) and (env.GetOption('clean')):
os.remove(config_h_file_path)
config_h_body += "#define %s 1\n\n" % get_define_from_string(
function_name)
conf.Finish()
-
# Autoconf feature doesn't work with Jenkins' arduino toolchain, so hardcode it here.
if target_os == 'arduino':
config_h_body += "#define HAVE_ARDUINO_TIME_H\n\n"
# Generate the file
+ if not os.path.exists(cur_dir):
+ os.makedirs(cur_dir)
if os.path.exists(config_h_file_path):
os.remove(config_h_file_path)
config_h_file = open(config_h_file_path, "w")
config_h_file.write(config_h_header + config_h_body + config_h_footer)
config_h_file.close()
+
# Sanity check to ensure that the above block created the file.
if (not os.path.exists(config_h_file_path)) and (not env.GetOption('clean')):
print "Error: iotivity_config.h file not created!"
Exit(1)
-# iotivity_config.h should be copied to the build dir
+# iotivity_config.h should be copied to installation dir
env.UserInstallTargetHeader(
config_h_file_path, 'c_common', 'iotivity_config.h')
# Use the generated file internally
-env.AppendUnique(CPPPATH=[os.path.join(src_dir, 'resource', 'c_common')])
+env.AppendUnique(CPPPATH=[cur_dir])
######################################################################
cp resource/csdk/stack/include/ocpresence.h %{DEST_INC_DIR}
cp resource/csdk/stack/include/ocpayload.h %{DEST_INC_DIR}
cp resource/c_common/platform_features.h %{DEST_INC_DIR}
-cp resource/c_common/iotivity_config.h %{DEST_INC_DIR}
+cp %{BUILD_DIR}/resource/c_common/iotivity_config.h %{DEST_INC_DIR}
cp resource/c_common/*/include/*.h %{DEST_INC_DIR}
cp resource/c_common/experimental/*.h* %{DEST_INC_DIR}/experimental/
cp resource/csdk/stack/include/payload_logging.h %{DEST_INC_DIR}
include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS)
+OIC_OUT_PATH := ../../../../../../../../out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
LOCAL_MODULE := easysetup-jni
$(LOCAL_PATH)/../../../../../../../../../resource/c_common/oic_string/include \
$(LOCAL_PATH)/../../../../../../../../../resource/include \
$(LOCAL_PATH)/../../../../../../../../../resource/c_common \
+ $(OIC_OUT_PATH)/resource/c_common \
$(LOCAL_PATH)/../../../../../../../../../resource/oc_logger/include \
$(LOCAL_PATH)/../../../../../../../../../resource/c_common/oic_malloc/include \
$(LOCAL_PATH)/../../../../../../../../../resource/csdk/connectivity/api \
LOCAL_PATH := $(call my-dir)
-
ROOT_PATH := ../../../../../../..
OIC_SRC_DIR := ../../../../../..
+OIC_OUT_PATH := $(OIC_SRC_DIR)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
include $(CLEAR_VARS)
OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(OIC_OUT_PATH)/resource/c_common
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(OIC_OUT_PATH)/resource/c_common
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common/oic_string/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(IOTIVITY_LIB_PATH)/resource/c_common
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/
LOCAL_C_INCLUDES := $(LOCAL_PATH)/util
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(IOTIVITY_LIB_PATH)/resource/c_common
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0