Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 07:03:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify apk.cmake to allow caller to include jar libs

Browse source
This commit is contained in:
Stephen Birarda 2014-11-17 13:13:54 -08:00
parent 52750f1ec5
commit c3f57cd07f
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmake/android/Apk.cmake
View file

@ -68,7 +68,7 @@ set(ANDROID_THIS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) # Directory this CMake fil
## - "jarsigner" (part of the JDK) ## - "jarsigner" (part of the JDK)
## - "zipalign" (part of the Android SDK) ## - "zipalign" (part of the Android SDK)
################################################## ##################################################
macro(android_create_apk name apk_directory shared_libraries assets data_directory) macro(android_create_apk name apk_directory shared_libraries jar_libraries assets data_directory)
if(ANDROID_APK_CREATE) if(ANDROID_APK_CREATE)
# Construct the current package name and theme # Construct the current package name and theme
set(ANDROID_APK_PACKAGE "${ANDROID_APK_TOP_LEVEL_DOMAIN}.${ANDROID_APK_DOMAIN}.${ANDROID_APK_SUBDOMAIN}") set(ANDROID_APK_PACKAGE "${ANDROID_APK_TOP_LEVEL_DOMAIN}.${ANDROID_APK_DOMAIN}.${ANDROID_APK_SUBDOMAIN}")
@ -128,6 +128,15 @@ macro(android_create_apk name apk_directory shared_libraries assets data_directo
) )
endforeach() endforeach()
# Copy any required external jars to the libs folder
foreach(value ${jar_libraries})
add_custom_command(TARGET ${ANDROID_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${value} "${apk_directory}/libs/"
)
endforeach()
# Create "build.xml", "default.properties", "local.properties" and "proguard.cfg" files # Create "build.xml", "default.properties", "local.properties" and "proguard.cfg" files
add_custom_command(TARGET ${ANDROID_NAME} add_custom_command(TARGET ${ANDROID_NAME}
COMMAND android update project -t android-${ANDROID_API_LEVEL} --name ${ANDROID_NAME} --path "${apk_directory}" COMMAND android update project -t android-${ANDROID_API_LEVEL} --name ${ANDROID_NAME} --path "${apk_directory}"

3
gvr-interface/CMakeLists.txt
View file

@ -24,10 +24,13 @@ set(ARM_TARGET "armeabi-v7a")
set(TARGET_SHARED_LIBRARIES ${${TARGET_NAME}_LIBRARIES_TO_LINK}) set(TARGET_SHARED_LIBRARIES ${${TARGET_NAME}_LIBRARIES_TO_LINK})
list(APPEND TARGET_SHARED_LIBRARIES "${LIBRARY_OUTPUT_PATH}/lib${TARGET_NAME}.so") list(APPEND TARGET_SHARED_LIBRARIES "${LIBRARY_OUTPUT_PATH}/lib${TARGET_NAME}.so")
set(TARGET_JAR_LIBRARIES "${QT_CMAKE_PREFIX_PATH}/../../jar/QtAndroid-bundled.jar")
android_create_apk( android_create_apk(
${TARGET_NAME} ${TARGET_NAME}
"${CMAKE_BINARY_DIR}/apk" "${CMAKE_BINARY_DIR}/apk"
"${TARGET_SHARED_LIBRARIES}" "${TARGET_SHARED_LIBRARIES}"
"${TARGET_JAR_LIBRARIES}"
"${CMAKE_CURRENT_SOURCE_DIR}/assets" "${CMAKE_CURRENT_SOURCE_DIR}/assets"
"Data" "Data"
) )