Skip to content

Commit 2fb16d2

Browse files
committed
Check $ANDROID_GAMES_SDK for GameActivity source
For convenience, when updating to new GameActivity versions, this makes it possible to build against the out-of-tree `android-games-sdk` repo. This also updates `generate-bindings.sh` to point at $ANDROID_GAMES_SDK if set. E.g. ``` git clone git@github.com:rust-mobile/android-games-sdk.git \ --branch android-activity-4.0.0 export ANDROID_GAMES_SDK=$PWD/android-games-sdk ./generate-bindings.sh cargo build --features=game-activity --target=aarch64-linux-android ```
1 parent a1eb26a commit 2fb16d2

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

android-activity/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#![allow(dead_code)]
22

33
fn build_glue_for_game_activity() {
4+
let android_games_sdk =
5+
std::env::var("ANDROID_GAMES_SDK").unwrap_or_else(|_err| "android-games-sdk".to_string());
6+
47
let activity_path = |src_inc, name| {
5-
format!("android-games-sdk/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}")
8+
format!("{android_games_sdk}/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}")
69
};
710
let textinput_path = |src_inc, name| {
8-
format!("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}")
11+
format!("{android_games_sdk}/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}")
912
};
1013

1114
for f in ["GameActivity.cpp", "GameActivityEvents.cpp"] {

android-activity/generate-bindings.sh

100644100755
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# First install bindgen-cli via `cargo install bindgen-cli`
44

5+
SDK_DIR="${ANDROID_GAMES_SDK:-android-games-sdk}"
56
if test -z "${ANDROID_NDK_ROOT}"; then
67
export ANDROID_NDK_ROOT=${ANDROID_NDK_HOME}
78
fi
@@ -37,9 +38,9 @@ while read ARCH && read TARGET ; do
3738
--blocklist-function 'GameActivity_onCreate_C' \
3839
--newtype-enum '\w+_(result|status)_t' \
3940
-- \
40-
-Iandroid-games-sdk/game-activity/prefab-src/modules/game-activity/include \
41-
-Iandroid-games-sdk/game-text-input/prefab-src/modules/game-text-input/include \
42-
-Iandroid-games-sdk/include \
41+
"-I$SDK_DIR/game-activity/prefab-src/modules/game-activity/include" \
42+
"-I$SDK_DIR/game-text-input/prefab-src/modules/game-text-input/include" \
43+
"-I$SDK_DIR/include" \
4344
--sysroot="$SYSROOT" --target=$TARGET
4445

4546
done << EOF

0 commit comments

Comments
 (0)