Skip to content

Commit 76a1de9

Browse files
syntaxerror247syntaxerror247
authored
Fix CI and add arm32 support (#25)
1 parent 1089cc8 commit 76a1de9

File tree

3 files changed

+231
-4
lines changed

3 files changed

+231
-4
lines changed

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ jobs:
106106
name: Build Godot release template for Android
107107
run: |
108108
cd godot
109-
scons p=android arch=arm64 generate_apk=yes ${BUILD_OPTIONS} target=template_release
109+
scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_release
110+
scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_release generate_apk=yes
110111
mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/
111-
mv ./bin/android_debug.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_release.apk
112+
mv ./bin/android_release.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_release.apk
112113
mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip
113114
114115
- name: Export debug project
@@ -122,7 +123,7 @@ jobs:
122123
godot --headless --export-debug "Android" build/android/GodSVG-Mobile-debug.apk
123124
124125
- name: Export release project
125-
if: github.event_name == 'workflow_dispatch'
126+
if: github.event.pull_request.head.repo.fork != true
126127
env:
127128
GODOT_ANDROID_KEYSTORE_RELEASE_PATH: "/tmp/release.keystore"
128129
GODOT_ANDROID_KEYSTORE_RELEASE_USER: ${{ secrets.KEY_ALIAS }}
@@ -131,6 +132,7 @@ jobs:
131132
cd godsvg
132133
mkdir -p build/android
133134
echo "${{ secrets.KEYSTORE }}" | base64 -d > /tmp/release.keystore
135+
godot --headless --export-release "Android(arm32)" build/android/GodSVG-Mobile-arm32.apk
134136
godot --headless --export-release "Android" build/android/GodSVG-Mobile.apk
135137
136138
- name: Upload debug artifact
@@ -148,3 +150,11 @@ jobs:
148150
path: godsvg/build/android/GodSVG-Mobile.apk
149151
if-no-files-found: ignore
150152
retention-days: 28
153+
154+
- name: Upload arm32 APK
155+
uses: actions/upload-artifact@v4
156+
with:
157+
name: ${{ env.PROJECT_NAME }}-arm32
158+
path: godsvg/build/android/GodSVG-Mobile-arm32.apk
159+
if-no-files-found: ignore
160+
retention-days: 28

‎export_presets.cfg‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,221 @@ permissions/write_social_stream=false
215215
permissions/write_sync_settings=false
216216
permissions/write_user_dictionary=false
217217
wear_os/swipe_to_dismiss=true
218+
219+
[preset.1]
220+
221+
name="Android(arm32)"
222+
platform="Android"
223+
runnable=false
224+
advanced_options=true
225+
dedicated_server=false
226+
custom_features=""
227+
export_filter="all_resources"
228+
include_filter=""
229+
exclude_filter="godot_only/*, *.md, *.ico, *.icns"
230+
export_path=""
231+
patches=PackedStringArray()
232+
encryption_include_filters=""
233+
encryption_exclude_filters=""
234+
seed=0
235+
encrypt_pck=false
236+
encrypt_directory=false
237+
script_export_mode=2
238+
239+
[preset.1.options]
240+
241+
custom_template/debug=""
242+
custom_template/release=""
243+
gradle_build/use_gradle_build=false
244+
gradle_build/gradle_build_directory=""
245+
gradle_build/android_source_template=""
246+
gradle_build/compress_native_libraries=false
247+
gradle_build/export_format=0
248+
gradle_build/min_sdk=""
249+
gradle_build/target_sdk=""
250+
architectures/armeabi-v7a=true
251+
architectures/arm64-v8a=false
252+
architectures/x86=false
253+
architectures/x86_64=false
254+
version/code=2
255+
version/name="1.0-alpha2"
256+
package/unique_name="com.godsvg.mobile"
257+
package/name="GodSVG Mobile"
258+
package/signed=true
259+
package/app_category=3
260+
package/retain_data_on_uninstall=false
261+
package/exclude_from_recents=false
262+
package/show_in_android_tv=false
263+
package/show_in_app_library=true
264+
package/show_as_launcher_app=false
265+
launcher_icons/main_192x192="res://godot_only/android_icons/legacy_icon.png"
266+
launcher_icons/adaptive_foreground_432x432="res://godot_only/android_icons/adaptive_foreground.png"
267+
launcher_icons/adaptive_background_432x432="res://godot_only/android_icons/adaptive_background.png"
268+
launcher_icons/adaptive_monochrome_432x432="uid://cop6bgxvtv4uq"
269+
graphics/opengl_debug=false
270+
xr_features/xr_mode=0
271+
gesture/swipe_to_dismiss=false
272+
screen/immersive_mode=false
273+
screen/support_small=true
274+
screen/support_normal=true
275+
screen/support_large=true
276+
screen/support_xlarge=true
277+
user_data_backup/allow=false
278+
command_line/extra_args=""
279+
apk_expansion/enable=false
280+
apk_expansion/SALT=""
281+
apk_expansion/public_key=""
282+
permissions/custom_permissions=PackedStringArray()
283+
permissions/access_checkin_properties=false
284+
permissions/access_coarse_location=false
285+
permissions/access_fine_location=false
286+
permissions/access_location_extra_commands=false
287+
permissions/access_media_location=false
288+
permissions/access_mock_location=false
289+
permissions/access_network_state=false
290+
permissions/access_surface_flinger=false
291+
permissions/access_wifi_state=false
292+
permissions/account_manager=false
293+
permissions/add_voicemail=false
294+
permissions/authenticate_accounts=false
295+
permissions/battery_stats=false
296+
permissions/bind_accessibility_service=false
297+
permissions/bind_appwidget=false
298+
permissions/bind_device_admin=false
299+
permissions/bind_input_method=false
300+
permissions/bind_nfc_service=false
301+
permissions/bind_notification_listener_service=false
302+
permissions/bind_print_service=false
303+
permissions/bind_remoteviews=false
304+
permissions/bind_text_service=false
305+
permissions/bind_vpn_service=false
306+
permissions/bind_wallpaper=false
307+
permissions/bluetooth=false
308+
permissions/bluetooth_admin=false
309+
permissions/bluetooth_privileged=false
310+
permissions/brick=false
311+
permissions/broadcast_package_removed=false
312+
permissions/broadcast_sms=false
313+
permissions/broadcast_sticky=false
314+
permissions/broadcast_wap_push=false
315+
permissions/call_phone=false
316+
permissions/call_privileged=false
317+
permissions/camera=false
318+
permissions/capture_audio_output=false
319+
permissions/capture_secure_video_output=false
320+
permissions/capture_video_output=false
321+
permissions/change_component_enabled_state=false
322+
permissions/change_configuration=false
323+
permissions/change_network_state=false
324+
permissions/change_wifi_multicast_state=false
325+
permissions/change_wifi_state=false
326+
permissions/clear_app_cache=false
327+
permissions/clear_app_user_data=false
328+
permissions/control_location_updates=false
329+
permissions/delete_cache_files=false
330+
permissions/delete_packages=false
331+
permissions/device_power=false
332+
permissions/diagnostic=false
333+
permissions/disable_keyguard=false
334+
permissions/dump=false
335+
permissions/expand_status_bar=false
336+
permissions/factory_test=false
337+
permissions/flashlight=false
338+
permissions/force_back=false
339+
permissions/get_accounts=false
340+
permissions/get_package_size=false
341+
permissions/get_tasks=false
342+
permissions/get_top_activity_info=false
343+
permissions/global_search=false
344+
permissions/hardware_test=false
345+
permissions/inject_events=false
346+
permissions/install_location_provider=false
347+
permissions/install_packages=false
348+
permissions/install_shortcut=false
349+
permissions/internal_system_window=false
350+
permissions/internet=true
351+
permissions/kill_background_processes=false
352+
permissions/location_hardware=false
353+
permissions/manage_accounts=false
354+
permissions/manage_app_tokens=false
355+
permissions/manage_documents=false
356+
permissions/manage_external_storage=true
357+
permissions/master_clear=false
358+
permissions/media_content_control=false
359+
permissions/modify_audio_settings=false
360+
permissions/modify_phone_state=false
361+
permissions/mount_format_filesystems=false
362+
permissions/mount_unmount_filesystems=false
363+
permissions/nfc=false
364+
permissions/persistent_activity=false
365+
permissions/post_notifications=false
366+
permissions/process_outgoing_calls=false
367+
permissions/read_calendar=false
368+
permissions/read_call_log=false
369+
permissions/read_contacts=false
370+
permissions/read_external_storage=false
371+
permissions/read_frame_buffer=false
372+
permissions/read_history_bookmarks=false
373+
permissions/read_input_state=false
374+
permissions/read_logs=false
375+
permissions/read_media_audio=false
376+
permissions/read_media_images=false
377+
permissions/read_media_video=false
378+
permissions/read_media_visual_user_selected=false
379+
permissions/read_phone_state=false
380+
permissions/read_profile=false
381+
permissions/read_sms=false
382+
permissions/read_social_stream=false
383+
permissions/read_sync_settings=false
384+
permissions/read_sync_stats=false
385+
permissions/read_user_dictionary=false
386+
permissions/reboot=false
387+
permissions/receive_boot_completed=false
388+
permissions/receive_mms=false
389+
permissions/receive_sms=false
390+
permissions/receive_wap_push=false
391+
permissions/record_audio=false
392+
permissions/reorder_tasks=false
393+
permissions/restart_packages=false
394+
permissions/send_respond_via_message=false
395+
permissions/send_sms=false
396+
permissions/set_activity_watcher=false
397+
permissions/set_alarm=false
398+
permissions/set_always_finish=false
399+
permissions/set_animation_scale=false
400+
permissions/set_debug_app=false
401+
permissions/set_orientation=false
402+
permissions/set_pointer_speed=false
403+
permissions/set_preferred_applications=false
404+
permissions/set_process_limit=false
405+
permissions/set_time=false
406+
permissions/set_time_zone=false
407+
permissions/set_wallpaper=false
408+
permissions/set_wallpaper_hints=false
409+
permissions/signal_persistent_processes=false
410+
permissions/status_bar=false
411+
permissions/subscribed_feeds_read=false
412+
permissions/subscribed_feeds_write=false
413+
permissions/system_alert_window=false
414+
permissions/transmit_ir=false
415+
permissions/uninstall_shortcut=false
416+
permissions/update_device_stats=false
417+
permissions/use_credentials=false
418+
permissions/use_sip=false
419+
permissions/vibrate=false
420+
permissions/wake_lock=false
421+
permissions/write_apn_settings=false
422+
permissions/write_calendar=false
423+
permissions/write_call_log=false
424+
permissions/write_contacts=false
425+
permissions/write_external_storage=false
426+
permissions/write_gservices=false
427+
permissions/write_history_bookmarks=false
428+
permissions/write_profile=false
429+
permissions/write_secure_settings=false
430+
permissions/write_settings=false
431+
permissions/write_sms=false
432+
permissions/write_social_stream=false
433+
permissions/write_sync_settings=false
434+
permissions/write_user_dictionary=false
435+
wear_os/swipe_to_dismiss=true

‎src/autoload/HandlerGUI.gd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ func get_min_ui_scale() -> float:
366366

367367
func get_auto_ui_scale() -> float:
368368
var dpi := DisplayServer.screen_get_dpi(DisplayServer.window_get_current_screen())
369-
print(dpi)
370369
if dpi <= 120:
371370
return 0.75 # ldpi
372371
elif dpi <= 160:

0 commit comments

Comments
 (0)