Skip to content

Commit f0df76e

Browse files
syntaxerror247syntaxerror247
authored
Re-enable x86_64 builds and remove arm32 from debug apks (#81)
1 parent cc3ecd3 commit f0df76e

2 files changed

Lines changed: 244 additions & 9 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,33 @@ jobs:
9898
name: Build Godot debug template for Android
9999
run: |
100100
cd godot
101-
scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_debug
102101
scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_debug generate_android_binaries=yes
103102
mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/
104103
mv ./bin/android_debug.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_debug.apk
105-
mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip
104+
mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source_debug.zip
106105
107106
- if: ${{ steps.cache-template.outputs.cache-hit != 'true' && env.BUILD_TYPE == 'release' }}
108107
name: Build Godot release template for Android
109108
run: |
110109
cd godot
110+
scons p=android arch=x86_64 ${BUILD_OPTIONS} lto=thin target=template_release debug_symbols=yes
111111
scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_release debug_symbols=yes
112112
scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_release debug_symbols=yes separate_debug_symbols=yes generate_android_binaries=yes
113113
mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/
114114
mv ./bin/android_release.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_release.apk
115115
mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip
116-
mv ./bin/android-template-release-native-symbols.zip ~/.local/share/godot/native_debug_symbols.zip
116+
mv ./bin/android-template-release-native-symbols.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/native_debug_symbols.zip
117117
118118
- name: Set up android build template
119119
run: |
120+
TEMPLATE="android_source.zip"
121+
if [ "${BUILD_TYPE}" = "debug" ]; then
122+
TEMPLATE="android_source_debug.zip"
123+
fi
124+
120125
cd vectortouch
121126
mkdir -p android/build
122-
unzip -q ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip -d android/build
127+
unzip -q ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/${TEMPLATE} -d android/build
123128
touch android/build/.gdignore
124129
echo "${GODOT_VERSION}.${GODOT_RELEASE}" > android/.build_version
125130
@@ -139,7 +144,7 @@ jobs:
139144
run: |
140145
cd vectortouch
141146
mkdir -p artifacts
142-
godot --headless --export-debug "Android" artifacts/VectorTouch-debug.apk
147+
godot --headless --export-debug "Android-debug" artifacts/VectorTouch-debug.apk
143148
144149
- name: Export release project
145150
if: env.BUILD_TYPE == 'release'

‎export_presets.cfg‎

Lines changed: 234 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[preset.0]
22

3-
name="Android"
3+
name="Android-debug"
44
platform="Android"
55
runnable=true
66
dedicated_server=false
@@ -37,7 +37,7 @@ gradle_build/custom_theme_attributes={
3737
"[splash]android:windowSplashScreenBackground": "#1a1a1a",
3838
"[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
3939
}
40-
architectures/armeabi-v7a=true
40+
architectures/armeabi-v7a=false
4141
architectures/arm64-v8a=true
4242
architectures/x86=false
4343
architectures/x86_64=false
@@ -230,7 +230,7 @@ wear_os/swipe_to_dismiss=true
230230

231231
[preset.1]
232232

233-
name="Android-aab"
233+
name="Android"
234234
platform="Android"
235235
runnable=false
236236
dedicated_server=false
@@ -254,6 +254,236 @@ script_export_mode=2
254254

255255
[preset.1.options]
256256

257+
custom_template/debug=""
258+
custom_template/release=""
259+
gradle_build/use_gradle_build=true
260+
gradle_build/gradle_build_directory=""
261+
gradle_build/android_source_template=""
262+
gradle_build/compress_native_libraries=true
263+
gradle_build/export_format=0
264+
gradle_build/min_sdk=""
265+
gradle_build/target_sdk=""
266+
gradle_build/custom_theme_attributes={
267+
"[splash]android:windowSplashScreenBackground": "#1a1a1a",
268+
"[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
269+
}
270+
architectures/armeabi-v7a=true
271+
architectures/arm64-v8a=true
272+
architectures/x86=false
273+
architectures/x86_64=true
274+
version/code=11
275+
version/name="1.0-alpha5-dev"
276+
package/unique_name="com.vectortouch.app"
277+
package/name="VectorTouch"
278+
package/signed=true
279+
package/app_category=3
280+
package/retain_data_on_uninstall=false
281+
package/exclude_from_recents=false
282+
package/show_in_android_tv=false
283+
package/show_in_app_library=true
284+
package/show_as_launcher_app=false
285+
launcher_icons/main_192x192="uid://dclf4s1sqdf7b"
286+
launcher_icons/adaptive_foreground_432x432="uid://crxn45laxli7b"
287+
launcher_icons/adaptive_background_432x432="uid://by3jh6qw02yds"
288+
launcher_icons/adaptive_monochrome_432x432="uid://bxfhj5jliswi5"
289+
graphics/opengl_debug=false
290+
shader_baker/enabled=false
291+
xr_features/xr_mode=0
292+
gesture/swipe_to_dismiss=false
293+
screen/immersive_mode=false
294+
screen/edge_to_edge=false
295+
screen/support_small=true
296+
screen/support_normal=true
297+
screen/support_large=true
298+
screen/support_xlarge=true
299+
screen/background_color=Color(0.101960786, 0.101960786, 0.101960786, 1)
300+
user_data_backup/allow=false
301+
command_line/extra_args=""
302+
apk_expansion/enable=false
303+
apk_expansion/SALT=""
304+
apk_expansion/public_key=""
305+
permissions/custom_permissions=PackedStringArray()
306+
permissions/access_checkin_properties=false
307+
permissions/access_coarse_location=false
308+
permissions/access_fine_location=false
309+
permissions/access_location_extra_commands=false
310+
permissions/access_media_location=false
311+
permissions/access_mock_location=false
312+
permissions/access_network_state=false
313+
permissions/access_surface_flinger=false
314+
permissions/access_wifi_state=false
315+
permissions/account_manager=false
316+
permissions/add_voicemail=false
317+
permissions/authenticate_accounts=false
318+
permissions/battery_stats=false
319+
permissions/bind_accessibility_service=false
320+
permissions/bind_appwidget=false
321+
permissions/bind_device_admin=false
322+
permissions/bind_input_method=false
323+
permissions/bind_nfc_service=false
324+
permissions/bind_notification_listener_service=false
325+
permissions/bind_print_service=false
326+
permissions/bind_remoteviews=false
327+
permissions/bind_text_service=false
328+
permissions/bind_vpn_service=false
329+
permissions/bind_wallpaper=false
330+
permissions/bluetooth=false
331+
permissions/bluetooth_admin=false
332+
permissions/bluetooth_privileged=false
333+
permissions/brick=false
334+
permissions/broadcast_package_removed=false
335+
permissions/broadcast_sms=false
336+
permissions/broadcast_sticky=false
337+
permissions/broadcast_wap_push=false
338+
permissions/call_phone=false
339+
permissions/call_privileged=false
340+
permissions/camera=false
341+
permissions/capture_audio_output=false
342+
permissions/capture_secure_video_output=false
343+
permissions/capture_video_output=false
344+
permissions/change_component_enabled_state=false
345+
permissions/change_configuration=false
346+
permissions/change_network_state=false
347+
permissions/change_wifi_multicast_state=false
348+
permissions/change_wifi_state=false
349+
permissions/clear_app_cache=false
350+
permissions/clear_app_user_data=false
351+
permissions/control_location_updates=false
352+
permissions/delete_cache_files=false
353+
permissions/delete_packages=false
354+
permissions/device_power=false
355+
permissions/diagnostic=false
356+
permissions/disable_keyguard=false
357+
permissions/dump=false
358+
permissions/expand_status_bar=false
359+
permissions/factory_test=false
360+
permissions/flashlight=false
361+
permissions/force_back=false
362+
permissions/get_accounts=false
363+
permissions/get_package_size=false
364+
permissions/get_tasks=false
365+
permissions/get_top_activity_info=false
366+
permissions/global_search=false
367+
permissions/hardware_test=false
368+
permissions/inject_events=false
369+
permissions/install_location_provider=false
370+
permissions/install_packages=false
371+
permissions/install_shortcut=false
372+
permissions/internal_system_window=false
373+
permissions/internet=true
374+
permissions/kill_background_processes=false
375+
permissions/location_hardware=false
376+
permissions/manage_accounts=false
377+
permissions/manage_app_tokens=false
378+
permissions/manage_documents=false
379+
permissions/manage_external_storage=false
380+
permissions/manage_media=false
381+
permissions/master_clear=false
382+
permissions/media_content_control=false
383+
permissions/modify_audio_settings=false
384+
permissions/modify_phone_state=false
385+
permissions/mount_format_filesystems=false
386+
permissions/mount_unmount_filesystems=false
387+
permissions/nfc=false
388+
permissions/persistent_activity=false
389+
permissions/post_notifications=false
390+
permissions/process_outgoing_calls=false
391+
permissions/read_calendar=false
392+
permissions/read_call_log=false
393+
permissions/read_contacts=false
394+
permissions/read_external_storage=false
395+
permissions/read_frame_buffer=false
396+
permissions/read_history_bookmarks=false
397+
permissions/read_input_state=false
398+
permissions/read_logs=false
399+
permissions/read_media_audio=false
400+
permissions/read_media_images=false
401+
permissions/read_media_video=false
402+
permissions/read_media_visual_user_selected=false
403+
permissions/read_phone_state=false
404+
permissions/read_profile=false
405+
permissions/read_sms=false
406+
permissions/read_social_stream=false
407+
permissions/read_sync_settings=false
408+
permissions/read_sync_stats=false
409+
permissions/read_user_dictionary=false
410+
permissions/reboot=false
411+
permissions/receive_boot_completed=false
412+
permissions/receive_mms=false
413+
permissions/receive_sms=false
414+
permissions/receive_wap_push=false
415+
permissions/record_audio=false
416+
permissions/reorder_tasks=false
417+
permissions/restart_packages=false
418+
permissions/send_respond_via_message=false
419+
permissions/send_sms=false
420+
permissions/set_activity_watcher=false
421+
permissions/set_alarm=false
422+
permissions/set_always_finish=false
423+
permissions/set_animation_scale=false
424+
permissions/set_debug_app=false
425+
permissions/set_orientation=false
426+
permissions/set_pointer_speed=false
427+
permissions/set_preferred_applications=false
428+
permissions/set_process_limit=false
429+
permissions/set_time=false
430+
permissions/set_time_zone=false
431+
permissions/set_wallpaper=false
432+
permissions/set_wallpaper_hints=false
433+
permissions/signal_persistent_processes=false
434+
permissions/status_bar=false
435+
permissions/subscribed_feeds_read=false
436+
permissions/subscribed_feeds_write=false
437+
permissions/system_alert_window=false
438+
permissions/transmit_ir=false
439+
permissions/uninstall_shortcut=false
440+
permissions/update_device_stats=false
441+
permissions/use_credentials=false
442+
permissions/use_sip=false
443+
permissions/vibrate=false
444+
permissions/wake_lock=false
445+
permissions/write_apn_settings=false
446+
permissions/write_calendar=false
447+
permissions/write_call_log=false
448+
permissions/write_contacts=false
449+
permissions/write_external_storage=false
450+
permissions/write_gservices=false
451+
permissions/write_history_bookmarks=false
452+
permissions/write_profile=false
453+
permissions/write_secure_settings=false
454+
permissions/write_settings=false
455+
permissions/write_sms=false
456+
permissions/write_social_stream=false
457+
permissions/write_sync_settings=false
458+
permissions/write_user_dictionary=false
459+
wear_os/swipe_to_dismiss=true
460+
461+
[preset.2]
462+
463+
name="Android-aab"
464+
platform="Android"
465+
runnable=false
466+
dedicated_server=false
467+
custom_features=""
468+
export_filter="all_resources"
469+
include_filter="*.toml"
470+
exclude_filter="godot_only/*, *.md, *.ico, *.icns"
471+
export_path=""
472+
patches=PackedStringArray()
473+
patch_delta_encoding=false
474+
patch_delta_compression_level_zstd=19
475+
patch_delta_min_reduction=0.1
476+
patch_delta_include_filters="*"
477+
patch_delta_exclude_filters=""
478+
encryption_include_filters=""
479+
encryption_exclude_filters=""
480+
seed=0
481+
encrypt_pck=false
482+
encrypt_directory=false
483+
script_export_mode=2
484+
485+
[preset.2.options]
486+
257487
custom_template/debug=""
258488
custom_template/release=""
259489
gradle_build/use_gradle_build=true
@@ -270,7 +500,7 @@ gradle_build/custom_theme_attributes={
270500
architectures/armeabi-v7a=true
271501
architectures/arm64-v8a=true
272502
architectures/x86=false
273-
architectures/x86_64=false
503+
architectures/x86_64=true
274504
version/code=11
275505
version/name="1.0-alpha5-dev"
276506
package/unique_name="com.vectortouch.app"

0 commit comments

Comments
 (0)