Auto-commit after successful build: update app gameplay/UI, improve build setup
Changed files:\nCrossCompileGitForAndroid.sh SetupBuildEnvironment.sh app/build.gradle.kts app/src/main/assets/native-git/arm64-v8a/git app/src/main/java/com/kawomi/githugandroid/GitRuntime.kt
This commit is contained in:
@@ -16,6 +16,10 @@ LOCAL_PROPERTIES_PATH="$PROJECT_DIR/local.properties"
|
||||
ANDROID_CMDLINE_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
|
||||
GRADLE_DIST_URL="https://services.gradle.org/distributions/gradle-8.7-bin.zip"
|
||||
JDK_DIST_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse"
|
||||
ANDROID_NDK_PACKAGE="ndk;27.2.12479018"
|
||||
ANDROID_CMAKE_PACKAGE="cmake;3.22.1"
|
||||
ANDROID_NDK_DIR="$SDK_DIR/ndk/27.2.12479018"
|
||||
ANDROID_CMAKE_DIR="$SDK_DIR/cmake/3.22.1"
|
||||
STATE_TTL_SECONDS=86400
|
||||
|
||||
log() {
|
||||
@@ -242,7 +246,9 @@ ensure_sdk_packages() {
|
||||
if have_recent_success_marker \
|
||||
&& [ -d "$SDK_DIR/platform-tools" ] \
|
||||
&& [ -d "$SDK_DIR/platforms/android-34" ] \
|
||||
&& [ -d "$SDK_DIR/build-tools/34.0.0" ]; then
|
||||
&& [ -d "$SDK_DIR/build-tools/34.0.0" ] \
|
||||
&& [ -d "$ANDROID_NDK_DIR" ] \
|
||||
&& [ -d "$ANDROID_CMAKE_DIR" ]; then
|
||||
log "Skipping SDK verification/install because all components were confirmed within the last 24 hours"
|
||||
return
|
||||
fi
|
||||
@@ -263,7 +269,9 @@ ensure_sdk_packages() {
|
||||
"$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
|
||||
"platform-tools" \
|
||||
"platforms;android-34" \
|
||||
"build-tools;34.0.0"
|
||||
"build-tools;34.0.0" \
|
||||
"$ANDROID_NDK_PACKAGE" \
|
||||
"$ANDROID_CMAKE_PACKAGE"
|
||||
|
||||
mark_successful_check
|
||||
}
|
||||
@@ -286,6 +294,12 @@ main() {
|
||||
require_tool curl
|
||||
require_tool unzip
|
||||
require_tool tar
|
||||
require_tool git
|
||||
require_tool perl
|
||||
require_tool make
|
||||
require_tool clang
|
||||
require_tool pkg-config
|
||||
require_tool readelf
|
||||
|
||||
ensure_dir "$TMP_DIR"
|
||||
ensure_dir "$SDK_DIR"
|
||||
@@ -301,6 +315,9 @@ main() {
|
||||
log "Project dir: $PROJECT_DIR"
|
||||
log "JDK dir: $JDK_DIR"
|
||||
log "SDK dir: $SDK_DIR"
|
||||
log "NDK dir: $ANDROID_NDK_DIR"
|
||||
log "CMake dir: $ANDROID_CMAKE_DIR"
|
||||
log "To cross-compile Git for Android arm64-v8a: bash ./CrossCompileGitForAndroid.sh"
|
||||
log "To build without a background Gradle daemon: ./gradlew --no-daemon assembleDebug"
|
||||
log "To setup and build in one step: bash ./SetupBuildEnvironment.sh --build"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user