Drop redundant parts of CMake for host build

Change-Id: Ic0f819cbadccffc6fa42e6d167e07441ce93020f

diff --git a/CMakeLists.host-build b/CMakeLists.host-build
index fd347c9..566e4a3 100644 (file)
--- a/CMakeLists.host-build
+++ b/CMakeLists.host-build
@@ -17,42 +17,7 @@
 #
 
 
-ADD_DEFINITIONS("-DFEATURE_SUPPORT_CAPABILITY")
-ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 ADD_DEFINITIONS("-DHOST_BUILD")
 
-SET(SRCS
-       src/upgrade-apply-deltafs/fota_util.c
-       src/upgrade-apply-deltafs/ua.c
-       src/upgrade-apply-deltafs/engine/SS_Common.c
-       src/upgrade-apply-deltafs/engine/SS_UPI.c
-       src/upgrade-apply-deltafs/engine/SS_FSUpdate.c
-       src/upgrade-apply-deltafs/engine/SS_PatchDelta.c
-       src/upgrade-apply-deltafs/engine/fota_log.c
-       src/upgrade-apply-deltafs/engine/fota_tar.c
-       src/upgrade-apply/sha1/sha1.c
-       src/upgrade-apply/patch/patch_helper.c
-       src/upgrade-apply/patch/patch.c
-       src/upgrade-apply/patch/brotli.c
-)
-
-INCLUDE_DIRECTORIES(src/upgrade-apply/sha1)
-INCLUDE_DIRECTORIES(src/upgrade-apply/patch)
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED libbrotlienc zlib)
-
-FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -I./include")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-SET(EXECNAME "upgrade-apply-deltafs")
-SET(BINDIR "/usr/bin")
-ADD_EXECUTABLE(${EXECNAME} ${SRCS})
-
-TARGET_LINK_LIBRARIES(${EXECNAME} PRIVATE ${${PROJECT_NAME}_pkgs_LDFLAGS} "-g" "-pthread")
-TARGET_LINK_LIBRARIES(${EXECNAME} PRIVATE libtar.a libbrotlidec.a libbrotlicommon.a)
-INSTALL(TARGETS ${EXECNAME} DESTINATION ${BINDIR})
+ADD_SUBDIRECTORY(src/upgrade-apply)
+ADD_SUBDIRECTORY(src/upgrade-apply-deltafs)

diff --git a/src/upgrade-apply-deltafs/CMakeLists.txt b/src/upgrade-apply-deltafs/CMakeLists.txt
index aa7a321..d518d0d 100644 (file)
--- a/src/upgrade-apply-deltafs/CMakeLists.txt
+++ b/src/upgrade-apply-deltafs/CMakeLists.txt
@@ -20,7 +20,13 @@ INCLUDE_DIRECTORIES(../upgrade-apply/sha1)
 INCLUDE_DIRECTORIES(../upgrade-apply/patch)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED libbrotlienc hal-api-device zlib)
+
+IF(DEFINE_HOST_BUILD)
+pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED libbrotlienc zlib)
+ELSE()
+pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED libbrotlienc zlib hal-api-device)
+ENDIF()
+
 
 FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")