Add import-games-sdk.sh and import some APP_CMD_ changes for 4.0.0

rib · rib · commit 36832feacf39 · 2025-04-01T15:41:51.000+01:00
This replaces `copy-files` + `file_list.txt` (subjective simplification) This imports the SDK from commit 1b544f896646b29e798c5be0a151a488906797f7, from: https://github.com/rust-mobile/android-games-sdk/commits/android-activity-4.0.0
diff --git a/android-activity/android-games-sdk/copy-files b/android-activity/android-games-sdk/copy-files
diff --git a/android-activity/android-games-sdk/file_list.txt b/android-activity/android-games-sdk/file_list.txt
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common
@@ -0,0 +1 @@
+../../../../../include/common/
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
@@ -217,6 +217,13 @@ struct android_app {
 
   /**
    * Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.
+   *
+   * Note: the upstream comment above isn't accurate.
+   * - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`
+   *   changes, not `editorAction`.
+   * - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for
+   *   `window` state there's no synchonization that blocks the Java main
+   *   thread, so we can't say that this is only valid within the `APP_CMD_` handler.
    */
   int editorAction;
 
@@ -441,17 +448,17 @@ enum NativeAppGlueAppCmd : int8_t {
   /**
    * Command from main thread: an editor action has been triggered.
    */
-  APP_CMD_EDITOR_ACTION,
+  //APP_CMD_EDITOR_ACTION,
 
   /**
    * Command from main thread: a keyboard event has been received.
    */
-  APP_CMD_KEY_EVENT,
+  //APP_CMD_KEY_EVENT,
 
   /**
    * Command from main thread: a touch event has been received.
    */
-  APP_CMD_TOUCH_EVENT,
+  //APP_CMD_TOUCH_EVENT,
 
 };
 
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json
@@ -0,0 +1,8 @@
+{
+  "export_libraries": [],
+  "library_name": null,
+  "android": {
+    "export_libraries": ["-landroid", "-llog"],
+    "library_name": null
+  }
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp
@@ -0,0 +1 @@
+../../../../../../src/common/system_utils.cpp
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
@@ -579,7 +579,7 @@ static bool onTouchEvent(GameActivity* activity,
   ++inputBuffer->motionEventsCount;
   notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_TOUCH_EVENT);
+  //android_app_write_cmd(android_app, APP_CMD_TOUCH_EVENT);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
@@ -665,7 +665,7 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
   ++inputBuffer->keyEventsCount;
   notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_KEY_EVENT);
+  //android_app_write_cmd(android_app, APP_CMD_KEY_EVENT);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
@@ -722,9 +722,15 @@ static bool onEditorAction(GameActivity* activity, int action) {
   struct android_app* android_app = ToApp(activity);
 
   pthread_mutex_lock(&android_app->mutex);
+
+  // XXX: this is a racy design that could lose InputConnection actions if the
+  // application doesn't manage to look at app->editorAction before another
+  // action is delivered.
   android_app->editorAction = action;
+  // TODO: buffer these actions like other input events
+  //notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_EDITOR_ACTION);
+  //android_app_write_cmd(android_app, APP_CMD_EDITOR_ACTION);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/prefab.json b/android-activity/android-games-sdk/game-activity/prefab-src/prefab.json
@@ -0,0 +1,13 @@
+{
+  "name": "game-activity",
+  "schema_version": 1,
+  "dependencies": [],
+  "version": "0.0.1",
+  "cpp_files": [
+    "src/common/system_utils.cpp",
+    "src/game-activity/GameActivity.cpp",
+    "src/game-activity/native_app_glue/android_native_app_glue.c",
+    "src/game-activity/GameActivityEvents.cpp",
+    "src/game-text-input/gametextinput.cpp"
+  ]
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common
@@ -0,0 +1 @@
+../../../../../include/common/
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json
@@ -0,0 +1,8 @@
+{
+  "export_libraries": [],
+  "library_name": null,
+  "android": {
+    "export_libraries": null,
+    "library_name": null
+  }
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json b/android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json
@@ -0,0 +1,9 @@
+{
+  "name": "game-text-input",
+  "schema_version": 1,
+  "dependencies": [],
+  "version": "0.0.1",
+  "cpp_files": [
+    "src/game-text-input/gametextinput.cpp"
+  ]
+}
diff --git a/android-activity/android-games-sdk/import-games-sdk.sh b/android-activity/android-games-sdk/import-games-sdk.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -xe
+
+# Copies the native, prefab-src for GameActivity + GameTextInput from the
+# upstream, android-games-sdk, including our android-activity integration
+# changes.
+#
+# This code is maintained out-of-tree, based on a fork of Google's AGDK repo, so
+# it's more practical to try and upstream changes we make, or to rebase on new
+# versions.
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <android-games-sdk dir>"
+    exit 1
+fi
+
+SOURCE_DIR="$1"
+TOP_DIR=$(git rev-parse --show-toplevel)
+DEST_DIR="$TOP_DIR/android-activity/android-games-sdk"
+
+if [ ! -d "$SOURCE_DIR" ]; then
+    echo "Error: Source directory '$SOURCE_DIR' does not exist."
+    exit 1
+fi
+
+if [ ! -d "$DEST_DIR" ]; then
+    echo "Error: expected find destination directory $DEST_DIR"
+    exit 1
+fi
+
+rm -fr "$DEST_DIR/game-activity"
+rm -fr "$DEST_DIR/game-text-input"
+rm -fr "$DEST_DIR/src/common"
+rm -fr "$DEST_DIR/include/common"
+
+mkdir -p "$DEST_DIR/game-activity"
+mkdir -p "$DEST_DIR/game-text-input"
+mkdir -p "$DEST_DIR/include/common"
+mkdir -p "$DEST_DIR/src/common"
+
+cp -av "$SOURCE_DIR/game-activity/prefab-src" "$DEST_DIR/game-activity"
+cp -av "$SOURCE_DIR/game-text-input/prefab-src" "$DEST_DIR/game-text-input"
+cp -av "$SOURCE_DIR/include/common/gamesdk_common.h" "$DEST_DIR/include/common"
+cp -av "$SOURCE_DIR/src/common/system_utils.h" "$DEST_DIR/src/common"
+cp -av "$SOURCE_DIR/src/common/system_utils.cpp" "$DEST_DIR/src/common"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../../game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../../src/common/system_utils.cpp`