From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- cmake/scripts/android/Install.cmake | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'cmake/scripts/android/Install.cmake') diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index 46181f7..cc52d51 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -26,14 +26,38 @@ 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) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/build.gradle + ${CMAKE_BINARY_DIR}/tools/android/packaging/build.gradle COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradlew + ${CMAKE_BINARY_DIR}/tools/android/packaging/gradlew COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/settings.gradle + ${CMAKE_BINARY_DIR}/tools/android/packaging/settings.gradle COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.jar + ${CMAKE_BINARY_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.jar COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties + ${CMAKE_BINARY_DIR}/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties COPYONLY) file(WRITE ${CMAKE_BINARY_DIR}/tools/depends/Makefile.include "$(PREFIX)/lib/${APP_NAME_LC}/lib${APP_NAME_LC}.so: ;\n") +string(REPLACE "." ";" APP_VERSION_CODE_LIST ${APP_VERSION_CODE}) +list(GET APP_VERSION_CODE_LIST 0 major) +list(GET APP_VERSION_CODE_LIST 1 minor) +list(GET APP_VERSION_CODE_LIST 2 patch) +unset(APP_VERSION_CODE_LIST) +math(EXPR APP_VERSION_CODE_ANDROID "(${major} * 100 + ${minor}) * 1000 + ${patch}") +unset(major) +unset(minor) +if(ARCH STREQUAL aarch64 AND patch LESS 999) + math(EXPR APP_VERSION_CODE_ANDROID "${APP_VERSION_CODE_ANDROID} + 1") +endif() +unset(patch) + set(package_files strings.xml activity_main.xml colors.xml searchable.xml AndroidManifest.xml + build.gradle src/Main.java src/Splash.java src/XBMCBroadcastReceiver.java @@ -124,6 +148,8 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean CC=${CMAKE_C_COMPILER} CPU=${CPU} ARCH=${ARCH} + HOST=${HOST} + TOOLCHAIN=${TOOLCHAIN} PREFIX=${prefix} DEPENDS_PATH=${DEPENDS_PATH} NDKROOT=${NDKROOT} -- cgit v1.2.3