Fixed Android build with SDK revision 14
This commit is contained in:
@@ -214,7 +214,17 @@ if(ANDROID)
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/res"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/gen"
|
||||
DEPENDS ${lib_proj_files}
|
||||
)
|
||||
)
|
||||
if (ANT_EXECUTABLE AND ANDROID_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13)
|
||||
add_custom_command(
|
||||
TARGET ${target}
|
||||
COMMAND ${ANDROID_EXECUTABLE} update lib-project --path "${CMAKE_BINARY_DIR}"
|
||||
COMMAND ${ANT_EXECUTABLE} debug
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
|
||||
DEPENDS ${lib_target}
|
||||
)
|
||||
endif()
|
||||
|
||||
add_dependencies(${lib_target} ${api_target})
|
||||
add_dependencies(${target} ${lib_target})
|
||||
|
||||
|
12
modules/java/android/project.properties
Normal file
12
modules/java/android/project.properties
Normal file
@@ -0,0 +1,12 @@
|
||||
# This file is automatically generated by Android Tools.
|
||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||
#
|
||||
# This file must be checked in Version Control Systems.
|
||||
#
|
||||
# To customize properties used by the Ant build system use,
|
||||
# "build.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
android.library=true
|
||||
# Project target.
|
||||
target=android-8
|
Reference in New Issue
Block a user