Add macro definitions for rk3288, and revert some modifitions according to release 4.2.3 of smartdevicelink.

Author: luwanjia

CMakeLists.txt

@@ -38,7 +38,7 @@ set (HMI "web" CACHE STRING "HMI type")
 option(HMI2 "Use Qt HMI" OFF)
 option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features relates to PulseAudio A2DP and GStreamer" OFF)
 option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF)
-option(BUILD_BT_SUPPORT "Bluetooth support" ON)
+option(BUILD_BT_SUPPORT "Bluetooth support" OFF)
 option(BUILD_USB_SUPPORT "libusb support" ON)
 option(BUILD_BACKTRACE_SUPPORT "backtrace support" OFF)
 option(BUILD_TESTS "Possibility to build and run tests" OFF)
@@ -49,6 +49,7 @@ option(ENABLE_SANITIZE "Sanitize tool" OFF)
 option(ENABLE_SECURITY "Security Ford protocol protection" OFF)
 option(ENABLE_HMI_PTU_DECRYPTION "Policy table update parsed by hmi" OFF)
 option(ENABLE_EXTENDED_POLICY "Turns extended flow which requires embedded system interaction" OFF)
+option(FIREFLY_RK3288 "Enable cross compile for embedded system of rk3288" ON)
 
 set(OS_TYPE_OPTION 	"$ENV{OS_TYPE}")
 set(DEBUG_OPTION 	"$ENV{DEBUG}")
@@ -64,10 +65,14 @@ set(SECURITY_OPTION 	"$ENV{SECURITY_MODE}")
 set(COMPONENTS_DIR ${CMAKE_SOURCE_DIR}/src/components)
 set(SNAPSHOT_TAG 	"$ENV{SNAPSHOT_TAG}")
 
-# Set the cross compiler
+if (FIREFLY_RK3288)
 set (CROSS_COMPILE_PREFIX "arm-linux-gnueabihf-")
 set (CMAKE_C_COMPILER ${CROSS_COMPILE_PREFIX}gcc)
 set (CMAKE_CXX_COMPILER ${CROSS_COMPILE_PREFIX}g++)
+else ()
+set(CMAKE_CXX_COMPILER   $ENV{CMAKE_CXX_COMPILER})
+set(CMAKE_C_COMPILER     $ENV{CMAKE_C_COMPILER})
+endif()
 
 if (ARCH_TYPE_OPTION)
   if (NOT (${ARCH_TYPE_OPTION} STREQUAL "x86") AND NOT (${ARCH_TYPE_OPTION} STREQUAL "armv7"))
@@ -174,7 +179,12 @@ add_custom_target(genivi-tarball
   COMMAND tar -cz -C /tmp/GENIVI -f ${CMAKE_BINARY_DIR}/genivi.tar.gz .
 )
 
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+project (${PROJECT})
+
+#ADD_DEPENDENCIES(${PROJECT} Policy)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 # Please do not change compiler/linker flags if You do not know how particular
 # flag is handled by CMake
@@ -195,6 +205,9 @@ set(CMAKE_CXX_FLAGS_DEBUG   " -DDEBUG -g3 -ggdb3")
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   add_definitions(-DOS_LINUX)
+  if (FIREFLY_RK3288)
+  add_definitions(-DFIREFLY_RK3288)
+  endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   add_definitions(-DOS_QNX)
   SET(BUILD_BT_SUPPORT OFF)
@@ -205,7 +218,9 @@ endif()
 
 if (BUILD_USB_SUPPORT)
   add_definitions(-DUSB_SUPPORT)
-  #find_package(UDev REQUIRED)
+  if (NOT FIREFLY_RK3288)
+  find_package(UDev REQUIRED)
+  endif()
   message(STATUS "USB support is enabled")
 endif()
 
@@ -375,6 +390,15 @@ if (HMIADAPTER STREQUAL "mqueue")
     add_definitions(-DHMI_JSON_API)
 endif()
 
+# --- Directory with SDL interfaces, global types and ProtocolLib component
+include_directories(
+  ${COMPONENTS_DIR}/include
+  ${COMPONENTS_DIR}/protocol/include
+if (BUILD_TESTS)
+  ${COMPONENTS_DIR}/include/test
+endif ()
+)
+
 # --- 3rd party libs
 INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/src/3rd_party/set_3rd_party_paths.cmake)
 
@@ -642,17 +666,19 @@ endif()
 add_subdirectory(./src/3rd_party-static)
 
 # --- Tools
-#add_subdirectory(./tools)
-
+if (NOT FIREFLY_RK3288)
+add_subdirectory(./tools)
+endif()
 # --- Components
 add_subdirectory(./src/components)
 
 # --- Main application
 add_subdirectory(./src/appMain)
 
 # --- Plugins
-#add_subdirectory(./src/plugins)
-
+if (NOT FIREFLY_RK3288)
+add_subdirectory(./src/plugins)
+endif()
 
 # Building tests
 if(BUILD_TESTS)

src/3rd_party-static/CMakeLists.txt

@@ -36,6 +36,7 @@ set(JSONCPP_INCLUDE_DIRECTORY ${JSONCPP_INCLUDE_DIRECTORY} PARENT_SCOPE)
 add_subdirectory(./MessageBroker)
 set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${MESSAGE_BROKER_INCLUDE_DIRECTORY} PARENT_SCOPE)
 
+if (FIREFLY_RK3288)
 # --- sqlite3-3.18
 add_subdirectory(./sqlite3-3.18)
 set(SQLITE3_INCLUDE_DIRECTORY ${SQLITE3_INCLUDE_DIRECTORY} PARENT_SCOPE)
@@ -44,6 +45,7 @@ set(SQLITE3_INCLUDE_DIRECTORY ${SQLITE3_INCLUDE_DIRECTORY} PARENT_SCOPE)
 add_subdirectory(./openssl-fips-2.0.9)
 set(OPENSSL_INCLUDE_DIRECTORY ${OPENSSL_INCLUDE_DIRECTORY} PARENT_SCOPE)
 set(OPENSSL_LIB_DIRECTORY ${OPENSSL_LIB_DIRECTORY} PARENT_SCOPE)
+endif()
 
 # --- encryption
 add_subdirectory(./encryption)

src/3rd_party-static/MessageBroker/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories (
   ./include/
   ../jsoncpp/include
   ../../components/utils/include
-  ../../components/include
+
 )
 
 set (MESSAGE_BROKER_SOURCES

src/3rd_party-static/encryption/CMakeLists.txt

@@ -3,14 +3,20 @@ set(ENCRYPTION_INCLUDE_DIRECTORY ${ENCRYPTION_INCLUDE_DIRECTORY} PARENT_SCOPE)
 
 include_directories (
   ./include
+)
+
+if (FIREFLY_RK3288)
+include_directories (
   ${OPENSSL_INCLUDE_DIRECTORY}
 )
+endif()
 
 set (SOURCES
     ./src/Base64.cpp
     ./src/hashing.cc
 )
 
+if (FIREFLY_RK3288)
 link_directories(
   ${OPENSSL_LIB_DIRECTORY}
 )
@@ -19,6 +25,7 @@ set (LIBRARIES
   crypto
   ssl
 )
+endif()
 
 add_library("encryption" ${SOURCES})
 target_link_libraries("encryption" "${LIBRARIES}")

src/3rd_party-static/libusbx-1.0.16/CMakeLists.txt

@@ -10,6 +10,7 @@ include_directories (
   ./
 )
 
+if (FIREFLY_RK3288)
 set (LIBUSB_SOURCES
 	./libusb/core.c
 	./libusb/descriptor.c
@@ -23,8 +24,25 @@ set (LIBUSB_SOURCES
 	./libusb/os/poll_posix.c
 	./libusb/os/threads_posix.c
 )
+else()
+set (LIBUSB_SOURCES
+	./libusb/core.c
+	./libusb/descriptor.c
+	./libusb/hotplug.c
+	./libusb/io.c
+	./libusb/strerror.c
+	./libusb/sync.c
+	./libusb/os/linux_udev.c
+	./libusb/os/linux_netlink.c
+	./libusb/os/linux_usbfs.c
+	./libusb/os/poll_posix.c
+	./libusb/os/threads_posix.c
+)
+endif()
 
 add_library("Libusb-1.0.16" ${LIBUSB_SOURCES})
 
 
-#target_link_libraries("Libusb-1.0.16" udev)
+if (NOT FIREFLY_RK3288)
+target_link_libraries("Libusb-1.0.16" udev)
+endif()

src/3rd_party-static/libusbx-1.0.16/config.h

@@ -120,7 +120,9 @@
 #define USBI_TIMERFD_AVAILABLE 1
 
 /* Use udev for device enumeration/hotplug */
-//#define USE_UDEV 1
+#ifndef FIREFLY_RK3288
+#define USE_UDEV 1
+#endif
 
 /* Version number of package */
 #define VERSION "1.0.16"

src/3rd_party/apache-log4cxx-cmake/CMakeLists.txt

@@ -40,12 +40,20 @@ file(MAKE_DIRECTORY
   ${LOG4CXX_BUILD_DIRECTORY}
 )
 
+if (FIREFLY_RK3288)
 set(COMMON_CONFIGURE_FLAGS
   "--host=arm-linux-gnueabihf"
   "--with-apr=../apr-build"
   "--with-apr-util=../apr-util-build"
   "LDFLAGS=-L${EXPAT_LIBS_DIRECTORY}"
 )
+else()
+set(COMMON_CONFIGURE_FLAGS
+  "--with-apr=../apr-build"
+  "--with-apr-util=../apr-util-build"
+  "LDFLAGS=-L${EXPAT_LIBS_DIRECTORY}"
+)
+endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   if (CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
@@ -55,9 +63,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   endif ()
   set(CONFIGURE_FLAGS "--host=${ARCHITECTURE}-nto-qnx" ${COMMON_CONFIGURE_FLAGS})
 else()
-  set(CONFIGURE_FLAGS 
-	${COMMON_CONFIGURE_FLAGS}
-  )
+  set(CONFIGURE_FLAGS ${COMMON_CONFIGURE_FLAGS})
 endif()
 
 add_custom_command(OUTPUT ${LOG4CXX_BUILD_DIRECTORY}/Makefile
@@ -67,10 +73,29 @@ add_custom_command(OUTPUT ${LOG4CXX_BUILD_DIRECTORY}/Makefile
   WORKING_DIRECTORY ${LOG4CXX_BUILD_DIRECTORY}
 )
 
+if (FIREFLY_RK3288)
 add_custom_target(liblog4cxx ALL make
   DEPENDS ${LOG4CXX_BUILD_DIRECTORY}/Makefile
   WORKING_DIRECTORY ${LOG4CXX_BUILD_DIRECTORY}
 )
+else()
+add_custom_target(liblog4cxx ALL make
+  COMMAND /bin/bash -c \"
+	cd ${CMAKE_CURRENT_SOURCE_DIR}\;
+	git log . 1>/dev/null 2>&1\;
+        if [ \\$$? == 0 ]; then
+          grep \\".commit_hash\\" ${LOG4CXX_LIBS_DIRECTORY}/liblog4cxx.so 1>/dev/null 2>&1\;
+          if [ ! \\\$$? == 0 ]\; then
+            cd ${CMAKE_CURRENT_SOURCE_DIR} &&
+            git log --pretty=\\"format:%H\\" -1 ${LOG4CXX_SOURCE_DIRECTORY} > /tmp/commit_hash 2>/dev/null &&
+            echo \\"Adding .commit_hash section\\" &&
+            ${objcopy} --add-section .commit_hash=/tmp/commit_hash ${LOG4CXX_LIBS_DIRECTORY}/liblog4cxx.so ${LOG4CXX_LIBS_DIRECTORY}/liblog4cxx.so 1>/dev/null 2>&1\;
+          fi;
+        fi\"
+  DEPENDS ${LOG4CXX_BUILD_DIRECTORY}/Makefile
+  WORKING_DIRECTORY ${LOG4CXX_BUILD_DIRECTORY}
+)
+endif()
 
 install(
   DIRECTORY ${LOG4CXX_LIBS_DIRECTORY}/

src/3rd_party/apr-1.5.0/threadproc/unix/thread.c

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "apr.h"
 #include "apr_portable.h"
 #include "apr_arch_threadproc.h"

src/3rd_party/apr-cmake/CMakeLists.txt

@@ -56,6 +56,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     "ac_cv_sizeof_struct_iovec=8"
   )
 else()
+if (FIREFLY_RK3288)
   set(CONFIGURE_FLAGS 
 	"--host=arm-linux-gnueabihf"
 	"ac_cv_file__dev_zero=yes"
@@ -67,6 +68,9 @@ else()
     	"apr_cv_mutex_robust_shared=no"
 	"LDFLAGS=-lpthread"
 	)
+else()
+  set(CONFIGURE_FLAGS "")
+endif()
 endif()
 
 add_custom_command(OUTPUT ${APR_BUILD_DIRECTORY}/Makefile

src/3rd_party/apr-util-cmake/CMakeLists.txt

@@ -40,19 +40,25 @@ file(MAKE_DIRECTORY
 set(EXPAT_SOURCE_DIRECTORY ${APR_UTIL_SOURCE_DIRECTORY}/../expat-2.1.0)
 set(EXPAT_BUILD_DIRECTORY ${APR_UTIL_BUILD_DIRECTORY}/../expat-2.1.0)
 
+if (FIREFLY_RK3288)
 set(COMMON_CONFIGURE_FLAGS
   "--host=arm-linux-gnueabihf"
   "--with-apr=../apr-build"
   "--with-expat-source=${EXPAT_SOURCE_DIRECTORY}"
   "--with-expat-build=${EXPAT_BUILD_DIRECTORY}"
 )
+else()
+set(COMMON_CONFIGURE_FLAGS
+  "--with-apr=../apr-build"
+  "--with-expat-source=${EXPAT_SOURCE_DIRECTORY}"
+  "--with-expat-build=${EXPAT_BUILD_DIRECTORY}"
+)
+endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   set(CONFIGURE_FLAGS "--host=${CMAKE_SYSTEM_PROCESSOR}-nto-qnx" ${COMMON_CONFIGURE_FLAGS})
 else()
-  set(CONFIGURE_FLAGS 
-	${COMMON_CONFIGURE_FLAGS}
-)
+  set(CONFIGURE_FLAGS ${COMMON_CONFIGURE_FLAGS})
 endif()
 
 

src/3rd_party/expat-2.1.0/CMakeLists.txt

@@ -1,7 +1,7 @@
 # This file is copyrighted under the BSD-license for buildsystem files of KDE
 # copyright 2010, Patrick Spendrin <ps_ml@gmx.de>
 
-set(TARGET expat)
+project(expat)
 
 cmake_minimum_required(VERSION 2.6)
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")

src/3rd_party/set_3rd_party_paths.cmake

@@ -28,7 +28,11 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+if(FIREFLY_RK3288)
+set(3RD_PARTY_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
+else()
 set(3RD_PARTY_INSTALL_PREFIX "$ENV{THIRD_PARTY_INSTALL_PREFIX}")
+endif()
 set(USE_DEFAULT_3RD_PARTY_PATH "true")
 if(3RD_PARTY_INSTALL_PREFIX)
   set(USE_DEFAULT_3RD_PARTY_PATH "false")

src/appMain/CMakeLists.txt

@@ -59,10 +59,12 @@ if (TELEMETRY_MONITOR)
         TelemetryMonitor)
 endif()
 
+if (FIREFLY_RK3288)
 link_directories(
   ${OPENSSL_LIB_DIRECTORY}
   ${BLUETOOTHLIBPATH}
 )
+endif()
 
 set(LIBRARIES
   MediaManager
@@ -120,7 +122,6 @@ include_directories (
   ${SecurityManagerIncludeDir}
   ${COMPONENTS_DIR}/security_manager/include
   ${COMPONENTS_DIR}/config_profile/include
-  ${COMPONENTS_DIR}/include/
   ${COMPONENTS_DIR}/utils/include/
   ${COMPONENTS_DIR}/connection_handler/include/
   ${COMPONENTS_DIR}/hmi_message_handler/include

src/appMain/log4cxx.properties

@@ -17,7 +17,7 @@ log4j.appender.TelnetLogging.layout=org.apache.log4j.PatternLayout
 log4j.appender.TelnetLogging.layout.ConversionPattern=%-5p [%d{dd MMM yyyy HH:mm:ss,SSS}][%t][%c] %F:%L %M: %m%n
 
 # Log file for all SmartDeviceLinkCore messages
-log4j.appender.SmartDeviceLinkCoreLogFile=org.apache.log4j.FileAppender
+log4j.appender.SmartDeviceLinkCoreLogFile=SafeFileAppender
 log4j.appender.SmartDeviceLinkCoreLogFile.File=SmartDeviceLinkCore.log
 log4j.appender.SmartDeviceLinkCoreLogFile.append=true
 log4j.appender.SmartDeviceLinkCoreLogFile.DatePattern='.' yyyy-MM-dd HH-mm

src/appMain/main.cc

@@ -41,13 +41,13 @@
 #include <fstream>   // cpplint: Streams are highly discouraged.
 
 // ----------------------------------------------------------------------------
-
+// If disable log4cxx, those tow header files should not be included.
 #ifdef ENABLE_LOG
 #include "utils/log_message_loop_thread.h"
 #include "utils/logger.h"
 #endif
 
-#include "life_cycle.h"
+#include "./life_cycle.h"
 #include "signal_handlers.h"
 
 #include "utils/signals.h"

src/components/CMakeLists.txt

@@ -29,7 +29,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 set(COMPONENTS_DIR ${CMAKE_SOURCE_DIR}/src/components)
-set(COMPONENTS_DIR ${COMPONENTS_DIR} PARENT_SCOPE)
 
 # --- HMI_API interfaces
 add_subdirectory(./interfaces)