From 1231ae73db59795d2571d9f67e7c6a72e0d443a9 Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Tue, 29 Sep 2015 12:33:35 +0530 Subject: [PATCH] [resource-hosting] Updated the Java SDK as per new folder structure. - Updated SDK. - Updated Android Sample Applications. Change-Id: Ifea8bb81528dceea0879729b06bf0f90fe9beb05 Signed-off-by: Jay Sharma Reviewed-on: https://gerrit.iotivity.org/gerrit/3251 Reviewed-by: Abhishek Pandey Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../SampleApp/android/SampleConsumer/.classpath | 1 - .../android/SampleConsumer/project.properties | 1 + .../SampleApp/android/SampleProviderApp/.classpath | 2 -- .../android/SampleProviderApp/project.properties | 1 + .../SampleResourceHosting/project.properties | 1 + .../android/resource_hosting/jni/Android.mk | 24 +++++++++++----------- .../android/resource_hosting/project.properties | 1 + .../iotivity/ResourceHosting/ResourceHosting.java | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/service/resource-hosting/SampleApp/android/SampleConsumer/.classpath b/service/resource-hosting/SampleApp/android/SampleConsumer/.classpath index e262cf6..0461652 100644 --- a/service/resource-hosting/SampleApp/android/SampleConsumer/.classpath +++ b/service/resource-hosting/SampleApp/android/SampleConsumer/.classpath @@ -5,6 +5,5 @@ - diff --git a/service/resource-hosting/SampleApp/android/SampleConsumer/project.properties b/service/resource-hosting/SampleApp/android/SampleConsumer/project.properties index 4ab1256..4ccceee 100644 --- a/service/resource-hosting/SampleApp/android/SampleConsumer/project.properties +++ b/service/resource-hosting/SampleApp/android/SampleConsumer/project.properties @@ -12,3 +12,4 @@ # Project target. target=android-19 +android.library.reference.1=../../../android/resource_hosting diff --git a/service/resource-hosting/SampleApp/android/SampleProviderApp/.classpath b/service/resource-hosting/SampleApp/android/SampleProviderApp/.classpath index 31cbdad..0461652 100644 --- a/service/resource-hosting/SampleApp/android/SampleProviderApp/.classpath +++ b/service/resource-hosting/SampleApp/android/SampleProviderApp/.classpath @@ -5,7 +5,5 @@ - - diff --git a/service/resource-hosting/SampleApp/android/SampleProviderApp/project.properties b/service/resource-hosting/SampleApp/android/SampleProviderApp/project.properties index 4ab1256..4ccceee 100644 --- a/service/resource-hosting/SampleApp/android/SampleProviderApp/project.properties +++ b/service/resource-hosting/SampleApp/android/SampleProviderApp/project.properties @@ -12,3 +12,4 @@ # Project target. target=android-19 +android.library.reference.1=../../../android/resource_hosting diff --git a/service/resource-hosting/SampleApp/android/SampleResourceHosting/project.properties b/service/resource-hosting/SampleApp/android/SampleResourceHosting/project.properties index 4ab1256..4ccceee 100755 --- a/service/resource-hosting/SampleApp/android/SampleResourceHosting/project.properties +++ b/service/resource-hosting/SampleApp/android/SampleResourceHosting/project.properties @@ -12,3 +12,4 @@ # Project target. target=android-19 +android.library.reference.1=../../../android/resource_hosting diff --git a/service/resource-hosting/android/resource_hosting/jni/Android.mk b/service/resource-hosting/android/resource_hosting/jni/Android.mk index 6adda62..e81ae39 100755 --- a/service/resource-hosting/android/resource_hosting/jni/Android.mk +++ b/service/resource-hosting/android/resource_hosting/jni/Android.mk @@ -1,67 +1,67 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI) +OIC_LIB_PATH := ../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI) LOCAL_MODULE := 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 +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := ca LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := oc_logger_core LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboc_logger_core.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := 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 +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := octbstack LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboctbstack.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := oc LOCAL_SRC_FILES := $(OIC_LIB_PATH)/liboc.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI) +OIC_LIB_PATH := ../../../../../android/android_api/base/libs/$(TARGET_ARCH_ABI) LOCAL_MODULE := ocstack-jni LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocstack-jni.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := rcsCommon LOCAL_SRC_FILES := $(OIC_LIB_PATH)/librcs_common.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := rcsClient LOCAL_SRC_FILES := $(OIC_LIB_PATH)/librcs_client.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := rcsServer LOCAL_SRC_FILES := $(OIC_LIB_PATH)/librcs_server.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -OIC_LIB_PATH := ../../../../../../out/android/$(TARGET_ARCH_ABI)/release +OIC_LIB_PATH := ../../../../../out/android/$(TARGET_ARCH_ABI)/release LOCAL_MODULE := resourceHosting LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libresource_hosting.so include $(PREBUILT_SHARED_LIBRARY) @@ -83,7 +83,7 @@ LOCAL_STATIC_LIBRARIES += rcsServer LOCAL_STATIC_LIBRARIES += resourceHosting -OIC_SRC_DIR := ../../../../.. +OIC_SRC_DIR := ../../../.. LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/stack/include \ $(OIC_SRC_DIR)/resource/csdk/logger/include \ diff --git a/service/resource-hosting/android/resource_hosting/project.properties b/service/resource-hosting/android/resource_hosting/project.properties index 00cf62b..362a0a3 100755 --- a/service/resource-hosting/android/resource_hosting/project.properties +++ b/service/resource-hosting/android/resource_hosting/project.properties @@ -12,3 +12,4 @@ # Project target. target=android-22 +android.library=true diff --git a/service/resource-hosting/android/resource_hosting/src/org/iotivity/ResourceHosting/ResourceHosting.java b/service/resource-hosting/android/resource_hosting/src/org/iotivity/ResourceHosting/ResourceHosting.java index 54bb366..0c73ac3 100755 --- a/service/resource-hosting/android/resource_hosting/src/org/iotivity/ResourceHosting/ResourceHosting.java +++ b/service/resource-hosting/android/resource_hosting/src/org/iotivity/ResourceHosting/ResourceHosting.java @@ -86,7 +86,7 @@ public class ResourceHosting { System.loadLibrary("rcs_common"); System.loadLibrary("rcs_client"); System.loadLibrary("rcs_server"); - System.loadLibrary("resourceHosting"); + System.loadLibrary("resource_hosting"); System.loadLibrary("ResourceHosing_JNI"); } } -- 2.7.4