Skip to content

Added build support for Android Arm64 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added build support for Android Arm64 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build/cmake_modules/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,12 @@ if(NOT APPLE)
set(GPA_COMMON_LINK_ARCHIVE_FLAG -Wl,--whole-archive)
set(GPA_COMMON_LINK_NO_ARCHIVE_FLAG -Wl,--no-whole-archive)
endif()
add_compile_options(-Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Wno-unused-value -msse -fvisibility=hidden)

add_compile_options(-Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Wno-unused-value -fvisibility=hidden)

# Don't add -msse if building for Android ARM. Arg is not relevant for ARM and -Werror,-Wunused-command-line-argument makes that an error
if(NOT ((ANDROID) AND (ANDROID_ABI STREQUAL "arm64-v8a")))
add_compile_options(-msse)
endif()

endif()
14 changes: 10 additions & 4 deletions build/pre_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ def pre_build(build_args):

build_dir_name = "cmake_bld"

if build_args.android == True:
build_dir_name = "cmake_bld_android"
if build_args.android_x64 == True:
build_dir_name = "cmake_bld_android_x64"
elif build_args.android_arm64 == True:
build_dir_name = "cmake_bld_android_arm64"

cmake_additional_args = PreBuildCMakeCommon.parse_cmake_arguments(build_args)

Expand All @@ -43,14 +45,13 @@ def pre_build(build_args):
else:
cmake_additional_args.append("-Dbuild=0")

if build_args.android == True:
if build_args.android_x64 == True or build_args.android_arm64 == True:
PreBuildCMakeCommon.cmake_generator_platforms.remove('x86')
android_ndk=os.environ["ANDROID_NDK"]
if android_ndk == "":
print("Android environment variable is not defined. Exiting.")
exit(1)
cmake_additional_args.append("-DBUILD_ANDROID=ON")
cmake_additional_args.append("-DANDROID_ABI=x86_64")
cmake_additional_args.append("-DANDROID_PLATFORM=24")
cmake_additional_args.append("-DANDROID_NATIVE_API_LEVEL=24")
cmake_additional_args.append("-DANDROID_STL=c++_static")
Expand All @@ -59,6 +60,11 @@ def pre_build(build_args):
cmake_additional_args.append("-Dskiptests=ON")
cmake_additional_args.append("-Dbuild-32bit=OFF")

if build_args.android_x64 == True:
cmake_additional_args.append("-DANDROID_ABI=x86_64")
elif build_args.android_arm64 == True:
cmake_additional_args.append("-DANDROID_ABI=arm64-v8a")

print(PreBuildCMakeCommon.cmake_generator)
if sys.platform == "win32":
for platform in PreBuildCMakeCommon.cmake_generator_platforms:
Expand Down
4 changes: 3 additions & 1 deletion scripts/pre_build_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ def define_cmake_arguments():
script_parser.add_argument("--nofetch", action="store_true", help="skip fetching repo dependencies")
script_parser.add_argument("--cmakecmd", type=str, default="cmake", help="command to use in place of 'cmake'")
script_parser.add_argument("--verbose", action="store_true", help="Turns on the verbosity of the script'")
script_parser.add_argument("--android", action="store_true", help="CMake will generate project files for android")
script_parser.add_argument("--android_x64", action="store_true", help="CMake will generate project files for Android x64")
script_parser.add_argument("--android_arm64", action="store_true", help="CMake will generate project files for Android Arm-64")
script_parser.add_argument("--android", dest="android_x64", action="store_true", help="Same as --android_x64 (for backwards compatibility)")

script_parser.add_argument("--clang_format", action="store_true", help="run clang-format on source files prior to performing a build")
script_parser.add_argument("--clang_tidy", action="store_true", help="run clang-tidy on source files after a build completes")
Expand Down
4 changes: 2 additions & 2 deletions source/examples/vulkan/vk_color_cube/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ elseif(ANDROID)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/shaders
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/obj/$<CONFIG>/
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/com/amd/gpa/vk_color_cube
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libGPUPerfAPIVK${TARGET_NAME_SUFFIX}.so ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/libs/lib/x86_64/libGPUPerfAPIVK${TARGET_NAME_SUFFIX}.so
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libVkColorCube${TARGET_NAME_SUFFIX}.so ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/libs/lib/x86_64/libVkColorCube${TARGET_NAME_SUFFIX}.so
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libGPUPerfAPIVK${TARGET_NAME_SUFFIX}.so ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/libs/lib/${ANDROID_ABI}/libGPUPerfAPIVK${TARGET_NAME_SUFFIX}.so
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libVkColorCube${TARGET_NAME_SUFFIX}.so ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/libs/lib/${ANDROID_ABI}/libVkColorCube${TARGET_NAME_SUFFIX}.so
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/VkColorCubeLoader.java ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/com/amd/gpa/vk_color_cube
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/vk_color_cube_shader.vert.spv ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/shaders/vk_color_cube_shader.vert.spv
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/vk_color_cube_shader.frag.spv ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/APK/$<CONFIG>/shaders/vk_color_cube_shader.frag.spv
Expand Down