- Changed library icnet - application interface

Change-Id: I25112ab1e1401a21ed2530d3874a7b4bf740ec5d
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>

1 files changed, 48 insertions, 32 deletions

diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt
index 7041a005..4b9e73ce 100644
--- a/libdash/CMakeLists.txt
+++ b/libdash/CMakeLists.txt
@@ -1,7 +1,23 @@
 cmake_minimum_required(VERSION 3.2)
 project(libdash)
 
-set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD")
+
+if(ANDROID_API)
+	include_directories(${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.9/include)
+	include_directories(${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include)
+	option(ANDROID "Build CP api based on ANDROID log lib" ON)
+	set(LIBXML2_INCLUDE_DIR "$ENV{DISTILLERY_ROOT_DIR}/external/libxml2_android/jni/libxml2/include")
+	set(LIBXML2_LIBRARIES "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libxml2.a")
+	set(CURL_INCLUDE_DIRS "$ENV{DISTILLERY_ROOT_DIR}/external/libcurl_android/jni/libcurl/include")
+	set(CURL_LIBRARIES "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl.a" "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl-library.a")
+	set(ANDROID_LIBRARIES "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/libz.a" "$ENV{NDK}/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ENV{ABI}/libgnustl_shared.so"  "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/liblog.so")
+	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -std=c++0x -g -DLOG_BUILD")
+else ()
+	set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD")
+	find_package(LibXml2 REQUIRED)
+	find_package(ZLIB REQUIRED)
+	find_package(CURL REQUIRED)
+endif (ANDROID_API)
 set(DEBUG_BUILD FALSE)
 set(HEADER_FILES
         include/config.h
@@ -168,7 +184,7 @@ include_directories(include)
 
 add_library(dash SHARED ${SOURCE_FILES})
 set_target_properties(dash PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES})
+target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} ${ANDROID_LIBRARIES})
 message("libxml ${LIBXML2_LIBRARIES} ${LIBXML2_INCLUDE_DIR}")
 install(TARGETS dash DESTINATION ${CMAKE_INSTALL_PREFIX}/lib PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT library)
 install(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libdash COMPONENT headers)
@@ -191,50 +207,50 @@ set(CPACK_COMPONENTS_ALL library headers documentation)
 
 # Get the version
 execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/version
-        OUTPUT_VARIABLE PACKAGE_VERSION)
+		OUTPUT_VARIABLE PACKAGE_VERSION)
 
 if (PACKAGE_VERSION)
-    string(STRIP ${PACKAGE_VERSION} PACKAGE_VERSION)
+	string(STRIP ${PACKAGE_VERSION} PACKAGE_VERSION)
 else()
-    set(PACKAGE_VERSION 1.0)
+	set(PACKAGE_VERSION 1.0)
 endif()
 
 if(DEB_PACKAGE)
-    set(TYPE "DEBIAN")
-    set(GENERATOR "DEB")
+	set(TYPE "DEBIAN")
+	set(GENERATOR "DEB")
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-dev")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+	set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+	set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-dev")
+	set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
 
-    set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
-    set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
-    set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+	set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+	set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+	set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
 
-    set(CPACK_${TYPE}_PACKAGE_SHLIBDEPS ON)
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libdash (>= 1.0), libxml2-dev, libcurl4-openssl-dev")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "")
+	set(CPACK_${TYPE}_PACKAGE_SHLIBDEPS ON)
+	set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "")
+	set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libdash (>= 1.0), libxml2-dev, libcurl4-openssl-dev")
+	set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "")
 elseif(RPM_PACKAGE)
-    set(TYPE "RPM")
-    set(GENERATOR "RPM")
+	set(TYPE "RPM")
+	set(GENERATOR "RPM")
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-devel")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+	set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+	set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-devel")
+	set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
 
-    set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
-    set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-devel-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
-    set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+	set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+	set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-devel-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+	set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
 
-    set(CPACK_${TYPE}_PACKAGE_AUTOREQ ON)
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libdash >= 1.0, libxml2-devel, libcurl-openssl-devel")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "")
+	set(CPACK_${TYPE}_PACKAGE_AUTOREQ ON)
+	set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "")
+	set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libdash >= 1.0, libxml2-devel, libcurl-openssl-devel")
+	set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "")
 
-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
+	set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
 else()
-    return()
+	return()
 endif()
 
 set(CPACK_GENERATOR ${GENERATOR})
@@ -247,4 +263,4 @@ set(CPACK_${TYPE}_PACKAGE_RELEASE 1)
 set(CPACK_${TYPE}_PACKAGE_VENDOR ${VENDOR})
 set(CPACK_${TYPE}_PACKAGE_DESCRIPTION "Open-source library that provides an object orient (OO) interface to the MPEG-DASH standard")
 
-include(CPack)
+include(CPack)
\ No newline at end of file