Skip to content

Commit 7597e9a

Browse files
committed
Revert "GameActivity PATCH: Rename android_main _rust_glue_entry"
This reverts commit 202ab4c.
1 parent 9445c1d commit 7597e9a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ static void* android_app_entry(void* param) {
233233
pthread_cond_broadcast(&android_app->cond);
234234
pthread_mutex_unlock(&android_app->mutex);
235235

236-
_rust_glue_entry(android_app);
236+
android_main(android_app);
237237

238238
android_app_destroy(android_app);
239239
return NULL;

android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ void android_app_clear_motion_events(struct android_input_buffer* inputBuffer);
448448
void android_app_clear_key_events(struct android_input_buffer* inputBuffer);
449449

450450
/**
451-
* This is a springboard into the Rust glue layer that wraps calling the
452-
* main entry for the app itself.
451+
* This is the function that application code must implement, representing
452+
* the main entry to the app.
453453
*/
454-
extern void _rust_glue_entry(struct android_app* app);
454+
extern void android_main(struct android_app* app);
455455

456456
/**
457457
* Set the filter to use when processing key events.

0 commit comments

Comments
 (0)