X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fthings-manager%2Fsdk%2Fjava%2Fjni%2FAndroid.mk;h=2d17144c67bd57795376b876ad8a09bca86dc9bc;hb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;hp=395d11fb1826383e9af517ae9208d97ab96a4f54;hpb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/things-manager/sdk/java/jni/Android.mk b/service/things-manager/sdk/java/jni/Android.mk
index 395d11f..2d17144 100644
--- a/service/things-manager/sdk/java/jni/Android.mk
+++ b/service/things-manager/sdk/java/jni/Android.mk
@@ -1,56 +1,69 @@
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(strip $(ANDROID_NDK)),)
-$(error ANDROID_NDK is not set!)
-endif
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release
+LOCAL_MODULE := android-oc_logger
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboc_logger.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release
+LOCAL_MODULE := android-octbstack
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboctbstack.so
+include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-OIC_LIB_PATH := ../../../../../dep/android/$(TARGET_ARCH_ABI)/usr/lib
-LOCAL_MODULE := libandroid-boost_system
-LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libboost_system.a
-include $(PREBUILT_STATIC_LIBRARY)
+OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release
+LOCAL_MODULE := android-oc
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboc.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release
+LOCAL_MODULE := android-connectivity_abstraction
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI)
+LOCAL_MODULE := android-ocstack-jni
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocstack-jni.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI)
+LOCAL_MODULE := android-ca-interface
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libca-interface.so
+include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release
-LOCAL_MODULE := libandroid-thingsmanager
+LOCAL_MODULE := android-thingsmanager
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libTGMSDKLibrary.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-OIC_LIB_PATH := ../../../../out/android/$(TARGET_ARCH_ABI)/release
-BASE_LIB_PATH := ../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI)
-OIC_RESOURCE_PATH := ../../../../resource
-OIC_SERVICE_PATH := ../../../../service
-OIC_OUT_PATH := ../../../../out
+OIC_SRC_DIR := ../../../..
 LOCAL_MODULE    := things-manager-jni
 
-LOCAL_C_INCLUDES := $(OIC_RESOURCE_PATH)/include \
-                    $(OIC_RESOURCE_PATH)/csdk/stack/include \
-                    $(OIC_RESOURCE_PATH)/csdk/ocsocket/include \
-                    $(OIC_RESOURCE_PATH)/oc_logger/include \
-                    $(OIC_RESOURCE_PATH)/android/include \
-                    $(OIC_RESOURCE_PATH)/dependencies/cereal/include \
-                    $(OIC_RESOURCE_PATH)/../extlibs/boost/boost_1_58_0 \
-                    $(OIC_RESOURCE_PATH)/../extlibs/timer \
-                    $(OIC_SERVICE_PATH)/things-manager/sdk/inc \
-                    $(OIC_SERVICE_PATH)/things-manager/sdk/src \
-                    $(OIC_SERVICE_PATH)/../android/android_api/base/jni \
-                    $(OIC_SERVICE_PATH)/../build_common/android/compatibility \
-                    $(LOCAL_PATH)/jniutil/inc \
-                    $(LOCAL_PATH)/tm/inc \
-                    $(LOCAL_PATH)/tm/src \
-                    $(LOCAL_PATH)/tm/src/base \
-                    $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(TOOLCHAIN_VERSION)/include \
-                    $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(TOOLCHAIN_VERSION)/libs/$(TARGET_ARCH_ABI)/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/jniutil/inc \
+                    $(OIC_SRC_DIR)/android/android_api/base/jni \
+                    $(OIC_SRC_DIR)/resource/include \
+                    $(OIC_SRC_DIR)/resource/csdk/stack/include \
+                    $(OIC_SRC_DIR)/resource/oc_logger/include \
+                    $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0 \
+                    $(OIC_SRC_DIR)/extlibs/timer \
+                    $(OIC_SRC_DIR)/service/things-manager/sdk/inc \
+                    $(LOCAL_PATH)/tm/inc
 
 LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/jniutil/src/*.cpp))
 LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/tm/src/*.cpp))
 
 LOCAL_CPPFLAGS := -std=c++0x -frtti -fexceptions
 
-LOCAL_LDLIBS := -llog -L$(BASE_LIB_PATH) -locstack-jni -L$(OIC_LIB_PATH) -loc -loctbstack -lcoap -loc_logger
-LOCAL_LDLIBS += -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(TOOLCHAIN_VERSION)/libs/$(TARGET_ARCH_ABI) -lgnustl_shared
-LOCAL_SHARED_LIBRARIES := android-thingsmanager
-LOCAL_STATIC_LIBRARIES := android-boost_system
+LOCAL_LDLIBS := -llog
+LOCAL_SHARED_LIBRARIES := android-ocstack-jni
+LOCAL_SHARED_LIBRARIES += android-thingsmanager
+LOCAL_SHARED_LIBRARIES += android-oc
 
 include $(BUILD_SHARED_LIBRARY)