From f44ecaa4f27e7538ddcad66d40e543bffa2d2d86 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 4 Jun 2017 16:57:49 +0200 Subject: sync with upstream --- cmake/scripts/android/ArchSetup.cmake | 34 +++++++++ cmake/scripts/android/Install.cmake | 137 ++++++++++++++++++++++++++++++++++ cmake/scripts/android/Macros.cmake | 1 + cmake/scripts/android/PathSetup.cmake | 33 ++++++++ 4 files changed, 205 insertions(+) create mode 100644 cmake/scripts/android/ArchSetup.cmake create mode 100644 cmake/scripts/android/Install.cmake create mode 120000 cmake/scripts/android/Macros.cmake create mode 100644 cmake/scripts/android/PathSetup.cmake (limited to 'cmake/scripts/android') diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake new file mode 100644 index 0000000..7b8b466 --- /dev/null +++ b/cmake/scripts/android/ArchSetup.cmake @@ -0,0 +1,34 @@ +if(NOT CMAKE_TOOLCHAIN_FILE) + message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for android. See ${CMAKE_SOURCE_DIR}/cmake/README.md") +elseif(NOT SDK_PLATFORM) + message(FATAL_ERROR "Toolchain did not define SDK_PLATFORM. Possibly outdated depends.") +endif() + +set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID) +set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE + -D_FILE_OFFSET_BITS=64) +set(PLATFORM_DIR linux) +if(WITH_ARCH) + set(ARCH ${WITH_ARCH}) +else() + if(CPU STREQUAL armeabi-v7a) + set(ARCH arm) + set(NEON True) + set(NEON_FLAGS "-mfpu=neon -mvectorize-with-neon-quad") + elseif(CPU STREQUAL arm64-v8a) + set(ARCH aarch64) + set(NEON True) + elseif(CPU STREQUAL i686) + set(ARCH i486-linux) + set(NEON False) + else() + message(SEND_ERROR "Unknown CPU: ${CPU}") + endif() +endif() + +set(ENABLE_X11 OFF CACHE BOOL "" FORCE) +set(ENABLE_AML OFF CACHE BOOL "" FORCE) +set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE) +set(ENABLE_MDNS OFF CACHE BOOL "" FORCE) + +list(APPEND DEPLIBS android log jnigraphics mediandk androidjni) diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake new file mode 100644 index 0000000..0ab7dbd --- /dev/null +++ b/cmake/scripts/android/Install.cmake @@ -0,0 +1,137 @@ +# Android packaging + +find_program(AAPT_EXECUTABLE aapt PATHS ${SDK_BUILDTOOLS_PATH}) +if(NOT AAPT_EXECUTABLE) + message(FATAL_ERROR "Could NOT find aapt executable") +endif() +find_program(DX_EXECUTABLE dx PATHS ${SDK_BUILDTOOLS_PATH}) +if(NOT DX_EXECUTABLE) + message(FATAL_ERROR "Could NOT find dx executable") +endif() +find_program(ZIPALIGN_EXECUTABLE zipalign PATHS ${SDK_BUILDTOOLS_PATH}) +if(NOT ZIPALIGN_EXECUTABLE) + message(FATAL_ERROR "Could NOT find zipalign executable") +endif() + +if(CMAKE_BUILD_TYPE STREQUAL Debug) + set(ANDROID_DEBUGGABLE true) +else() + set(ANDROID_DEBUGGABLE false) +endif() + +# Configure files into packaging environment. +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/Makefile.in + ${CMAKE_BINARY_DIR}/tools/android/packaging/Makefile @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/apksign + ${CMAKE_BINARY_DIR}/tools/android/packaging/apksign COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/make_symbols.sh + ${CMAKE_BINARY_DIR}/tools/android/packaging/make_symbols.sh COPYONLY) +file(WRITE ${CMAKE_BINARY_DIR}/tools/depends/Makefile.include + "$(PREFIX)/lib/${APP_NAME_LC}/lib${APP_NAME_LC}.so: ;\n") + +set(package_files strings.xml + activity_main.xml + colors.xml + searchable.xml + AndroidManifest.xml + src/org/xbmc/kodi/Main.java + src/org/xbmc/kodi/Splash.java + src/org/xbmc/kodi/XBMCBroadcastReceiver.java + src/org/xbmc/kodi/XBMCImageContentProvider.java + src/org/xbmc/kodi/XBMCInputDeviceListener.java + src/org/xbmc/kodi/XBMCJsonRPC.java + src/org/xbmc/kodi/XBMCMediaContentProvider.java + src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java + src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java + src/org/xbmc/kodi/XBMCRecommendationBuilder.java + src/org/xbmc/kodi/XBMCSearchableActivity.java + src/org/xbmc/kodi/XBMCSettingsContentObserver.java + src/org/xbmc/kodi/XBMCProperties.java + src/org/xbmc/kodi/XBMCVideoView.java + ) +foreach(file IN LISTS package_files) + configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/${file}.in + ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/${file} @ONLY) +endforeach() + +# Copy files to the location expected by the Android packaging scripts. +add_custom_target(bundle + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tools/android/packaging/media + ${CMAKE_BINARY_DIR}/tools/android/packaging/media + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/res + ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/res + COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/lib/python2.7 ${libdir}/python2.7 + COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} ${datadir}/${APP_NAME_LC} + COMMAND ${CMAKE_COMMAND} -E copy $ + ${libdir}/${APP_NAME_LC}/$) +add_dependencies(bundle ${APP_NAME_LC}) + +# This function is used to prepare a prefix expected by the Android packaging +# scripts. It creates a bundle_files command that is added to the bundle target. +function(add_bundle_file file destination relative) + if(NOT TARGET bundle_files) + file(REMOVE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake) + add_custom_target(bundle_files COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake) + add_dependencies(bundle bundle_files) + endif() + + string(REPLACE "${relative}/" "" outfile ${file}) + get_filename_component(file ${file} REALPATH) + get_filename_component(outdir ${outfile} DIRECTORY) + file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake + "file(COPY \"${file}\" DESTINATION \"${destination}/${outdir}\")\n") + if(file MATCHES "\\.so\\..+$") + get_filename_component(srcfile "${file}" NAME) + string(REGEX REPLACE "\\.so\\..+$" "\.so" destfile ${srcfile}) + file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake + "file(RENAME \"${destination}/${outdir}/${srcfile}\" \"${destination}/${outdir}/${destfile}\")\n") + endif() +endfunction() + +# Copy files into prefix +foreach(file IN LISTS XBT_FILES install_data) + string(REPLACE "${CMAKE_BINARY_DIR}/" "" file ${file}) + add_bundle_file(${CMAKE_BINARY_DIR}/${file} ${datarootdir}/${APP_NAME_LC} ${CMAKE_BINARY_DIR}) +endforeach() + +foreach(library IN LISTS LIBRARY_FILES) + add_bundle_file(${library} ${libdir}/${APP_NAME_LC} ${CMAKE_BINARY_DIR}) +endforeach() + +foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay) + string(TOUPPER ${lib} lib_up) + set(lib_so ${${lib_up}_SONAME}) + if(lib_so AND EXISTS ${DEPENDS_PATH}/lib/${lib_so}) + add_bundle_file(${DEPENDS_PATH}/lib/${lib_so} ${libdir} "") + endif() +endforeach() +add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "") + +# Main targets from Makefile.in +if(CPU MATCHES i686) + set(CPU x86) + set(ARCH x86) +endif() +foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean apk-sign) + add_custom_target(${target} + COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} ${CMAKE_MAKE_PROGRAM} + -C ${CMAKE_BINARY_DIR}/tools/android/packaging + CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} + CC=${CMAKE_C_COMPILER} + CPU=${CPU} + ARCH=${ARCH} + PREFIX=${prefix} + NDKROOT=${NDKROOT} + SDKROOT=${SDKROOT} + SDK_PLATFORM=${SDK_PLATFORM} + STRIP=${CMAKE_STRIP} + AAPT=${AAPT_EXECUTABLE} + DX=${DX_EXECUTABLE} + ZIPALIGN=${ZIPALIGN_EXECUTABLE} + ${target} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/android/packaging + ) + if(NOT target STREQUAL apk-clean) + add_dependencies(${target} bundle) + endif() +endforeach() diff --git a/cmake/scripts/android/Macros.cmake b/cmake/scripts/android/Macros.cmake new file mode 120000 index 0000000..2fdbb25 --- /dev/null +++ b/cmake/scripts/android/Macros.cmake @@ -0,0 +1 @@ +../linux/Macros.cmake \ No newline at end of file diff --git a/cmake/scripts/android/PathSetup.cmake b/cmake/scripts/android/PathSetup.cmake new file mode 100644 index 0000000..1274fcf --- /dev/null +++ b/cmake/scripts/android/PathSetup.cmake @@ -0,0 +1,33 @@ +if(NOT prefix) + set(prefix ${CMAKE_BINARY_DIR}/install) +endif() +set(CMAKE_INSTALL_PREFIX ${prefix}) +if(NOT exec_prefix) + set(exec_prefix ${prefix}) +endif() +if(NOT libdir) + set(libdir ${prefix}/lib) +endif() +if(NOT bindir) + set(bindir ${prefix}/bin) +endif() +if(NOT includedir) + set(includedir ${prefix}/include) +endif() +if(NOT datarootdir) + set(datarootdir ${prefix}/share) +endif() +if(NOT datadir) + set(datadir ${datarootdir}) +endif() + +list(APPEND final_message "-- PATH config --") +list(APPEND final_message "Prefix: ${prefix}") +list(APPEND final_message "Libdir: ${libdir}") +list(APPEND final_message "Bindir: ${bindir}") +list(APPEND final_message "Includedir: ${includedir}") +list(APPEND final_message "Datarootdir: ${datarootdir}") +list(APPEND final_message "Datadir: ${datadir}") + +set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/${APP_NAME_LC}\" + -DINSTALL_PATH=\"${datarootdir}/${APP_NAME_LC}\") -- cgit v1.2.3