lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 00:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure official builds still detect compatible android apks properly

Browse Source
This commit is contained in:
baldurk
2025-06-27 16:16:20 +01:00
parent 4ca999c73e
commit 3f85357598
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/buildscripts/build.sh
+3 -1
View File
@@ -295,6 +295,8 @@ echo "Platform: $PLATFORM";
echo "Build root: $BUILD_ROOT";
echo "Repository root: $REPO_ROOT";
export GITHASH=$(cd "${REPO_ROOT}" && git rev-parse HEAD)
if [[ "$TYPE" == "official" ]]; then
sed -i.bak "s%RENDERDOC_OFFICIAL_BUILD 0%RENDERDOC_OFFICIAL_BUILD 1%" "${REPO_ROOT}"/renderdoc/api/replay/version.h
@@ -304,7 +306,7 @@ if [[ "$TYPE" == "official" ]]; then
else # snapshot
export GITTAG=$(cd "${REPO_ROOT}" && git rev-parse HEAD)
export GITTAG=$GITHASH
fi;
util/buildscripts/scripts/compile_win32.sh
+8 -4
View File
@@ -116,12 +116,14 @@ AAPT=$(ls $ANDROID_SDK/build-tools/*/aapt{,.exe} 2>/dev/null | tail -n 1)
VERSION32=$($AAPT dump badging build-android-arm32/bin/*apk 2>/dev/null | grep -Eo "versionName='[0-9a-f]*'" | grep -Eo "'.*'" | tr -d "'")
VERSION64=$($AAPT dump badging build-android-arm64/bin/*apk 2>/dev/null | grep -Eo "versionName='[0-9a-f]*'" | grep -Eo "'.*'" | tr -d "'")
if [ "$VERSION32" == "$GITTAG" ]; then
if [ "$VERSION32" == "$GITHASH" ]; then
echo "Found existing compatible arm32 build at $GITTAG, not rebuilding";
echo "Found existing compatible arm32 build at $GITHASH, not rebuilding";
else
echo "Rebuilding as existing build is $VERSION32";
# Build the arm32 variant
rm -rf build-android-arm32
mkdir -p build-android-arm32
@@ -143,12 +145,14 @@ else
fi
if [ "$VERSION64" == "$GITTAG" ]; then
if [ "$VERSION64" == "$GITHASH" ]; then
echo "Found existing compatible arm64 build at $GITTAG, not rebuilding";
echo "Found existing compatible arm64 build at $GITHASH, not rebuilding";
else
echo "Rebuilding as existing build is $VERSION64";
rm -rf build-android-arm64
mkdir -p build-android-arm64
pushd build-android-arm64