From 12f6683ed8c4bb7b8ec0e123da3eebf5b70bfc88 Mon Sep 17 00:00:00 2001 From: Anish Kumar Date: Fri, 6 Mar 2026 22:03:52 +0530 Subject: [PATCH] Re-enable x86_64 builds and remove arm32 from debug apks --- .github/workflows/build.yml | 15 ++- export_presets.cfg | 238 +++++++++++++++++++++++++++++++++++- 2 files changed, 244 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ccc08f3..3ad0dfb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,28 +98,33 @@ jobs: name: Build Godot debug template for Android run: | cd godot - scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_debug scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_debug generate_android_binaries=yes mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/ mv ./bin/android_debug.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_debug.apk - mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip + mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source_debug.zip - if: ${{ steps.cache-template.outputs.cache-hit != 'true' && env.BUILD_TYPE == 'release' }} name: Build Godot release template for Android run: | cd godot + scons p=android arch=x86_64 ${BUILD_OPTIONS} lto=thin target=template_release debug_symbols=yes scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_release debug_symbols=yes scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_release debug_symbols=yes separate_debug_symbols=yes generate_android_binaries=yes mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/ mv ./bin/android_release.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_release.apk mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip - mv ./bin/android-template-release-native-symbols.zip ~/.local/share/godot/native_debug_symbols.zip + mv ./bin/android-template-release-native-symbols.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/native_debug_symbols.zip - name: Set up android build template run: | + TEMPLATE="android_source.zip" + if [ "${BUILD_TYPE}" = "debug" ]; then + TEMPLATE="android_source_debug.zip" + fi + cd vectortouch mkdir -p android/build - unzip -q ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip -d android/build + unzip -q ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/${TEMPLATE} -d android/build touch android/build/.gdignore echo "${GODOT_VERSION}.${GODOT_RELEASE}" > android/.build_version @@ -139,7 +144,7 @@ jobs: run: | cd vectortouch mkdir -p artifacts - godot --headless --export-debug "Android" artifacts/VectorTouch-debug.apk + godot --headless --export-debug "Android-debug" artifacts/VectorTouch-debug.apk - name: Export release project if: env.BUILD_TYPE == 'release' diff --git a/export_presets.cfg b/export_presets.cfg index e9ca463..f6598a9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -1,6 +1,6 @@ [preset.0] -name="Android" +name="Android-debug" platform="Android" runnable=true dedicated_server=false @@ -37,7 +37,7 @@ gradle_build/custom_theme_attributes={ "[splash]android:windowSplashScreenBackground": "#1a1a1a", "[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim" } -architectures/armeabi-v7a=true +architectures/armeabi-v7a=false architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false @@ -230,7 +230,7 @@ wear_os/swipe_to_dismiss=true [preset.1] -name="Android-aab" +name="Android" platform="Android" runnable=false dedicated_server=false @@ -254,6 +254,236 @@ script_export_mode=2 [preset.1.options] +custom_template/debug="" +custom_template/release="" +gradle_build/use_gradle_build=true +gradle_build/gradle_build_directory="" +gradle_build/android_source_template="" +gradle_build/compress_native_libraries=true +gradle_build/export_format=0 +gradle_build/min_sdk="" +gradle_build/target_sdk="" +gradle_build/custom_theme_attributes={ +"[splash]android:windowSplashScreenBackground": "#1a1a1a", +"[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim" +} +architectures/armeabi-v7a=true +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=true +version/code=11 +version/name="1.0-alpha5-dev" +package/unique_name="com.vectortouch.app" +package/name="VectorTouch" +package/signed=true +package/app_category=3 +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +package/show_in_android_tv=false +package/show_in_app_library=true +package/show_as_launcher_app=false +launcher_icons/main_192x192="uid://dclf4s1sqdf7b" +launcher_icons/adaptive_foreground_432x432="uid://crxn45laxli7b" +launcher_icons/adaptive_background_432x432="uid://by3jh6qw02yds" +launcher_icons/adaptive_monochrome_432x432="uid://bxfhj5jliswi5" +graphics/opengl_debug=false +shader_baker/enabled=false +xr_features/xr_mode=0 +gesture/swipe_to_dismiss=false +screen/immersive_mode=false +screen/edge_to_edge=false +screen/support_small=true +screen/support_normal=true +screen/support_large=true +screen/support_xlarge=true +screen/background_color=Color(0.101960786, 0.101960786, 0.101960786, 1) +user_data_backup/allow=false +command_line/extra_args="" +apk_expansion/enable=false +apk_expansion/SALT="" +apk_expansion/public_key="" +permissions/custom_permissions=PackedStringArray() +permissions/access_checkin_properties=false +permissions/access_coarse_location=false +permissions/access_fine_location=false +permissions/access_location_extra_commands=false +permissions/access_media_location=false +permissions/access_mock_location=false +permissions/access_network_state=false +permissions/access_surface_flinger=false +permissions/access_wifi_state=false +permissions/account_manager=false +permissions/add_voicemail=false +permissions/authenticate_accounts=false +permissions/battery_stats=false +permissions/bind_accessibility_service=false +permissions/bind_appwidget=false +permissions/bind_device_admin=false +permissions/bind_input_method=false +permissions/bind_nfc_service=false +permissions/bind_notification_listener_service=false +permissions/bind_print_service=false +permissions/bind_remoteviews=false +permissions/bind_text_service=false +permissions/bind_vpn_service=false +permissions/bind_wallpaper=false +permissions/bluetooth=false +permissions/bluetooth_admin=false +permissions/bluetooth_privileged=false +permissions/brick=false +permissions/broadcast_package_removed=false +permissions/broadcast_sms=false +permissions/broadcast_sticky=false +permissions/broadcast_wap_push=false +permissions/call_phone=false +permissions/call_privileged=false +permissions/camera=false +permissions/capture_audio_output=false +permissions/capture_secure_video_output=false +permissions/capture_video_output=false +permissions/change_component_enabled_state=false +permissions/change_configuration=false +permissions/change_network_state=false +permissions/change_wifi_multicast_state=false +permissions/change_wifi_state=false +permissions/clear_app_cache=false +permissions/clear_app_user_data=false +permissions/control_location_updates=false +permissions/delete_cache_files=false +permissions/delete_packages=false +permissions/device_power=false +permissions/diagnostic=false +permissions/disable_keyguard=false +permissions/dump=false +permissions/expand_status_bar=false +permissions/factory_test=false +permissions/flashlight=false +permissions/force_back=false +permissions/get_accounts=false +permissions/get_package_size=false +permissions/get_tasks=false +permissions/get_top_activity_info=false +permissions/global_search=false +permissions/hardware_test=false +permissions/inject_events=false +permissions/install_location_provider=false +permissions/install_packages=false +permissions/install_shortcut=false +permissions/internal_system_window=false +permissions/internet=true +permissions/kill_background_processes=false +permissions/location_hardware=false +permissions/manage_accounts=false +permissions/manage_app_tokens=false +permissions/manage_documents=false +permissions/manage_external_storage=false +permissions/manage_media=false +permissions/master_clear=false +permissions/media_content_control=false +permissions/modify_audio_settings=false +permissions/modify_phone_state=false +permissions/mount_format_filesystems=false +permissions/mount_unmount_filesystems=false +permissions/nfc=false +permissions/persistent_activity=false +permissions/post_notifications=false +permissions/process_outgoing_calls=false +permissions/read_calendar=false +permissions/read_call_log=false +permissions/read_contacts=false +permissions/read_external_storage=false +permissions/read_frame_buffer=false +permissions/read_history_bookmarks=false +permissions/read_input_state=false +permissions/read_logs=false +permissions/read_media_audio=false +permissions/read_media_images=false +permissions/read_media_video=false +permissions/read_media_visual_user_selected=false +permissions/read_phone_state=false +permissions/read_profile=false +permissions/read_sms=false +permissions/read_social_stream=false +permissions/read_sync_settings=false +permissions/read_sync_stats=false +permissions/read_user_dictionary=false +permissions/reboot=false +permissions/receive_boot_completed=false +permissions/receive_mms=false +permissions/receive_sms=false +permissions/receive_wap_push=false +permissions/record_audio=false +permissions/reorder_tasks=false +permissions/restart_packages=false +permissions/send_respond_via_message=false +permissions/send_sms=false +permissions/set_activity_watcher=false +permissions/set_alarm=false +permissions/set_always_finish=false +permissions/set_animation_scale=false +permissions/set_debug_app=false +permissions/set_orientation=false +permissions/set_pointer_speed=false +permissions/set_preferred_applications=false +permissions/set_process_limit=false +permissions/set_time=false +permissions/set_time_zone=false +permissions/set_wallpaper=false +permissions/set_wallpaper_hints=false +permissions/signal_persistent_processes=false +permissions/status_bar=false +permissions/subscribed_feeds_read=false +permissions/subscribed_feeds_write=false +permissions/system_alert_window=false +permissions/transmit_ir=false +permissions/uninstall_shortcut=false +permissions/update_device_stats=false +permissions/use_credentials=false +permissions/use_sip=false +permissions/vibrate=false +permissions/wake_lock=false +permissions/write_apn_settings=false +permissions/write_calendar=false +permissions/write_call_log=false +permissions/write_contacts=false +permissions/write_external_storage=false +permissions/write_gservices=false +permissions/write_history_bookmarks=false +permissions/write_profile=false +permissions/write_secure_settings=false +permissions/write_settings=false +permissions/write_sms=false +permissions/write_social_stream=false +permissions/write_sync_settings=false +permissions/write_user_dictionary=false +wear_os/swipe_to_dismiss=true + +[preset.2] + +name="Android-aab" +platform="Android" +runnable=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="*.toml" +exclude_filter="godot_only/*, *.md, *.ico, *.icns" +export_path="" +patches=PackedStringArray() +patch_delta_encoding=false +patch_delta_compression_level_zstd=19 +patch_delta_min_reduction=0.1 +patch_delta_include_filters="*" +patch_delta_exclude_filters="" +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.2.options] + custom_template/debug="" custom_template/release="" gradle_build/use_gradle_build=true @@ -270,7 +500,7 @@ gradle_build/custom_theme_attributes={ architectures/armeabi-v7a=true architectures/arm64-v8a=true architectures/x86=false -architectures/x86_64=false +architectures/x86_64=true version/code=11 version/name="1.0-alpha5-dev" package/unique_name="com.vectortouch.app"