diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index a6547df26..06bce4267 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Remove default github maven configuration # Workaround for: 'Unable to decrypt local Maven settings credentials' run: rm $Env:USERPROFILE\.m2\settings.xml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a43a92e75..31c8bcf1c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -105,7 +105,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Remove default github maven configuration run: rm $Env:USERPROFILE\.m2\settings.xml - name: Setup Android SDK diff --git a/lib/android_build/app/build.gradle b/lib/android_build/app/build.gradle index 3c678a272..9c5bbadf3 100644 --- a/lib/android_build/app/build.gradle +++ b/lib/android_build/app/build.gradle @@ -40,6 +40,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':maesdk') - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' } diff --git a/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java b/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java index d2d3df058..e83507dcf 100644 --- a/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java +++ b/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java @@ -19,6 +19,7 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; @@ -41,7 +42,14 @@ public void storeOneRecord() { room.storeRecords(record); assertEquals(1, room.getRecordCount(StorageRecord.EventLatency_Unspecified)); assertEquals(1, room.getRecordCount(StorageRecord.EventLatency_Normal)); - assertThat(room.totalSize(), Matchers.greaterThan(new Long(0))); + assertThat(room.totalSize(), Matchers.greaterThan(0L)); + + // Verify loadPageSize() returns a valid page size + long pageSize = room.loadPageSize(); + assertThat(pageSize, Matchers.greaterThan(0L)); + // Verify page size is a power of 2 (e.g., 4096) + assertThat(pageSize & (pageSize - 1), Matchers.is(0L)); + assertEquals(1, room.deleteAllRecords()); } } diff --git a/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java b/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java index ccc3ab7e8..95118242d 100644 --- a/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java +++ b/lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java @@ -254,7 +254,6 @@ public void resumingAlsoEnds() { @Test public void runNativeTests() { System.loadLibrary("native-lib"); - System.loadLibrary("maesdk"); Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); HttpClient client = new HttpClient(appContext); diff --git a/lib/android_build/app/src/main/cpp/CMakeLists.txt b/lib/android_build/app/src/main/cpp/CMakeLists.txt index 899be6e96..abb4adbce 100644 --- a/lib/android_build/app/src/main/cpp/CMakeLists.txt +++ b/lib/android_build/app/src/main/cpp/CMakeLists.txt @@ -81,10 +81,8 @@ include_directories( find_library(zlib-path z) -add_library(maesdk SHARED IMPORTED) -set_target_properties(maesdk PROPERTIES - IMPORTED_LOCATION "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so" - IMPORTED_LOCATION_Release "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so") +#Add maesdk as a dependency +add_subdirectory(../../../../maesdk/src/main/cpp maesdk) # include the other flavor of database: if maesdk builds with Room include sqlite # if maesdk builds with native sqlite, include Room diff --git a/lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java b/lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java index 4a3c77c10..7159f10a6 100644 --- a/lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java +++ b/lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java @@ -27,7 +27,6 @@ void log_failure(String filename, int line, String summary) { // Used to load the 'native-lib' library on application startup. static { System.loadLibrary("native-lib"); - System.loadLibrary("maesdk"); } HttpClient m_client; diff --git a/lib/android_build/build.gradle b/lib/android_build/build.gradle index bdfa5e7ff..0a0d74af7 100644 --- a/lib/android_build/build.gradle +++ b/lib/android_build/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/lib/android_build/gradle/wrapper/gradle-wrapper.jar b/lib/android_build/gradle/wrapper/gradle-wrapper.jar index 7454180f2..d64cd4917 100644 Binary files a/lib/android_build/gradle/wrapper/gradle-wrapper.jar and b/lib/android_build/gradle/wrapper/gradle-wrapper.jar differ diff --git a/lib/android_build/gradle/wrapper/gradle-wrapper.properties b/lib/android_build/gradle/wrapper/gradle-wrapper.properties index 28b7aa2d4..1af9e0930 100644 --- a/lib/android_build/gradle/wrapper/gradle-wrapper.properties +++ b/lib/android_build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Wed Feb 01 08:36:33 EET 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lib/android_build/gradlew b/lib/android_build/gradlew index 1b6c78733..1aa94a426 100755 --- a/lib/android_build/gradlew +++ b/lib/android_build/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/lib/android_build/gradlew.bat b/lib/android_build/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/lib/android_build/gradlew.bat +++ b/lib/android_build/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/lib/android_build/maesdk/build.gradle b/lib/android_build/maesdk/build.gradle index 6dda47eb8..0567582ec 100644 --- a/lib/android_build/maesdk/build.gradle +++ b/lib/android_build/maesdk/build.gradle @@ -38,7 +38,8 @@ android { arguments = [ "room.schemaLocation":"$projectDir/schemas".toString(), "room.incremental":"true", - "room.expandProjection":"true"] + "room.expandProjection":"true", + "room.generateKotlin":"false"] } } } @@ -72,14 +73,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - def room_version = '2.4.3' + def room_version = '2.8.4' implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.13.0' + testImplementation 'org.mockito:mockito-core:5.17.0' testImplementation "androidx.room:room-testing:$room_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' } \ No newline at end of file diff --git a/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java b/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java index 223ac388d..7f700c0b0 100644 --- a/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java +++ b/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/OfflineRoom.java @@ -8,21 +8,20 @@ import android.database.Cursor; import android.util.Log; -import androidx.annotation.Keep; -import androidx.annotation.NonNull; -import androidx.room.Room; -import androidx.room.RoomDatabase; - import java.util.Map; import java.util.TreeMap; import java.util.concurrent.Callable; +import androidx.annotation.Keep; +import androidx.room.Room; +import androidx.room.RoomDatabase; + @Keep public class OfflineRoom implements AutoCloseable { - class TrimTransaction implements Callable + static class TrimTransaction implements Callable { - OfflineRoom m_room = null; - long m_byteLimit = 0; + private final OfflineRoom m_room; + private final long m_byteLimit; public TrimTransaction(OfflineRoom room, long byteLimit) { @@ -47,9 +46,9 @@ public Long call() } long currentSize = m_room.totalSize(); if (currentSize <= m_byteLimit) { - return new Long(0); + return 0L; } - long postVacuum = currentSize; + long postVacuum; try { postVacuum = vacuum(currentSize); } catch (Exception e) { @@ -57,19 +56,20 @@ public Long call() postVacuum = currentSize; } if (postVacuum <= m_byteLimit) { - return new Long(0); + return 0L; } long records = m_room.m_srDao.totalRecordCount(); double fraction = 0.25; // fraction of current to be dropped - if (m_byteLimit > m_room.m_pageSize) { + long pageSize = m_room.loadPageSize(); + if (m_byteLimit > pageSize) { double dLimit = m_byteLimit; double dCurrent = postVacuum; fraction = Math.max(0.25, 1.0 - (dLimit / dCurrent)); } long to_drop = (long) Math.ceil(fraction * records); if (to_drop <= 0) { - return new Long(0); + return 0L; } long recordsDropped = m_room.m_srDao.trim(to_drop); long postDrop = m_room.totalSize(); @@ -82,15 +82,15 @@ public Long call() "Trim: dropped %d records, new size %d bytes", recordsDropped, reVacuum)); - return new Long(recordsDropped); - + return recordsDropped; } } - OfflineRoomDatabase m_db = null; - StorageRecordDao m_srDao = null; - StorageSettingDao m_settingDao = null; - long m_pageSize = 4096; + private OfflineRoomDatabase m_db; + private StorageRecordDao m_srDao; + private StorageSettingDao m_settingDao; + private long m_pageSize = -1; + private static final long PAGE_SIZE_DEFAULT = 4096; public OfflineRoom(Context context, String name) { RoomDatabase.Builder builder; @@ -105,24 +105,6 @@ public OfflineRoom(Context context, String name) { m_db = builder.build(); m_srDao = m_db.getStorageRecordDao(); m_settingDao = m_db.getStorageSettingDao(); - try (Cursor c = m_db.query("PRAGMA page_size", null)) { - if (c.getCount() == 1 && c.getColumnCount() == 1) { - c.moveToFirst(); - m_pageSize = c.getLong(0); - } else { - Log.e("MAE", - String.format("Unexpected result from PRAGMA page_size: %d rows, %d columns", - c.getCount(), - c.getColumnCount())); - } - } - long pageCount = -1; - try (Cursor c = m_db.query("PRAGMA page_count", null)) { - if (c.getCount() == 1 && c.getColumnCount() == 1) { - c.moveToFirst(); - pageCount = c.getLong(0); - } - } } public long[] storeRecords(StorageRecord... records) { @@ -186,8 +168,7 @@ public long[] storeFromBuffersIds(int count, int[] indices, byte[] bytes, int[] big[3 * i + 2], blob); } - long[] ids = storeRecords(records); - return ids; + return storeRecords(records); } public void storeFromBuffers(int count, int[] indices, byte[] bytes, int[] small, long[] big) @@ -258,6 +239,7 @@ public String getSetting(String name) public long totalSize() { long result = 0; + initPageSize(); try (Cursor c = m_db.query("PRAGMA page_count", null)) { assert(c.getCount() == 1 && c.getColumnCount() == 1); c.moveToFirst(); @@ -267,6 +249,11 @@ public long totalSize() return result; } + public long loadPageSize() { + initPageSize(); + return m_pageSize; + } + public StorageRecord[] getRecords(boolean shutdown, int minLatency, long limit) { return m_srDao.getRecords(shutdown, minLatency, limit); @@ -300,5 +287,27 @@ public void deleteSetting(String name) { } public static native void connectContext(Context context); + + private void initPageSize() { + if (m_pageSize == -1) { + try { + try (Cursor c = m_db.query("PRAGMA page_size", null)) { + if (c.getCount() == 1 && c.getColumnCount() == 1) { + c.moveToFirst(); + m_pageSize = c.getLong(0); + } else { + m_pageSize = PAGE_SIZE_DEFAULT; + Log.e("MAE", + String.format("Unexpected result from PRAGMA page_size: %d rows, %d columns", + c.getCount(), + c.getColumnCount())); + } + } + } catch (Exception e) { + m_pageSize = PAGE_SIZE_DEFAULT; + Log.e("MAE", "Failed to query PRAGMA page_size, using default page size.", e); + } + } + } } diff --git a/lib/android_build/tools.gradle b/lib/android_build/tools.gradle index 3b1c56f8f..7f4d1d743 100644 --- a/lib/android_build/tools.gradle +++ b/lib/android_build/tools.gradle @@ -1,12 +1,11 @@ android { - - compileSdkVersion = 32 + compileSdk 34 ndkVersion = System.getenv("ANDROID_NDK_VERSION") ?: "27.0.12077973" defaultConfig { - minSdkVersion 19 - targetSdkVersion 31 + minSdk 23 + targetSdk 34 } } diff --git a/tests/unittests/PalTests.cpp b/tests/unittests/PalTests.cpp index 777af54f1..1ec078916 100644 --- a/tests/unittests/PalTests.cpp +++ b/tests/unittests/PalTests.cpp @@ -147,7 +147,7 @@ TEST_F(PalTests, SdkVersion) class LogInitTest : public Test { protected: - const std::string validPath = "valid/path/"; + std::string validPath = "valid/path/"; void SetUp() override { @@ -155,6 +155,12 @@ class LogInitTest : public Test #if defined(_WIN32) || defined(_WIN64) CreateDirectoryA("valid", NULL); CreateDirectoryA(validPath.c_str(), NULL); + #elif defined(ANDROID) + std::string temp = MAT::GetTempDirectory(); + std::string parent = temp + PATH_SEPARATOR_CHAR + "valid"; + validPath = parent + PATH_SEPARATOR_CHAR + "path" + PATH_SEPARATOR_CHAR; + mkdir(parent.c_str(), 0777); + mkdir(validPath.c_str(), 0777); #else mkdir("valid", 0777); mkdir(validPath.c_str(), 0777); @@ -173,6 +179,11 @@ class LogInitTest : public Test #if defined(_WIN32) || defined(_WIN64) RemoveDirectoryA(validPath.c_str()); RemoveDirectoryA("valid"); + #elif defined(ANDROID) + rmdir(validPath.c_str()); + std::string temp = MAT::GetTempDirectory(); + std::string parent = temp + PATH_SEPARATOR_CHAR + "valid"; + rmdir(parent.c_str()); #else rmdir(validPath.c_str()); rmdir("valid"); @@ -210,7 +221,12 @@ TEST_F(LogInitTest, LogInitAlreadyInitialized) TEST_F(LogInitTest, LogInitPathWithoutTrailingSlash) { +#if defined(ANDROID) + std::string pathWithoutSlash = validPath; + pathWithoutSlash.pop_back(); +#else std::string pathWithoutSlash = "valid/path"; +#endif EXPECT_TRUE(PAL::detail::log_init(true, pathWithoutSlash)); EXPECT_TRUE(PAL::detail::getDebugLogStream()->is_open()); } @@ -219,6 +235,8 @@ TEST_F(LogInitTest, LogInitPathWithoutTrailingBackslash) { #if defined(_WIN32) || defined(_WIN64) std::string pathWithoutBackslash = "valid\\path"; +#elif defined(ANDROID) + std::string pathWithoutBackslash = MAT::GetTempDirectory() + PATH_SEPARATOR_CHAR + "valid//path"; #else std::string pathWithoutBackslash = "valid//path"; #endif diff --git a/tools/build-android-aar.sh b/tools/build-android-aar.sh new file mode 100755 index 000000000..055ae2fdd --- /dev/null +++ b/tools/build-android-aar.sh @@ -0,0 +1,210 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Build MAESDK Android AAR locally (debug+release) and collect symbols. +# Mirrors lib/modules/.github/workflows/build-android-aar.yml, simplified for local use. +# +# Usage: +# tools/build-android-aar.sh +# tools/build-android-aar.sh --install-ndk +# tools/build-android-aar.sh --ndk-version 27.0.12077973 --output-dir /tmp/out +# +# Notes: +# - Requires Java 17 and Android SDK cmdline-tools (sdkmanager) if you use --install-ndk. +# - Requires ANDROID_SDK_ROOT (or ANDROID_HOME) when installing NDK. + +ANDROID_NDK_VERSION_DEFAULT="27.0.12077973" +CMAKE_VERSION_DEFAULT="3.10.2.4988404" + +INSTALL_NDK=0 +CLEAN=0 +NDK_VERSION="$ANDROID_NDK_VERSION_DEFAULT" +CMAKE_VERSION="$CMAKE_VERSION_DEFAULT" +OUTPUT_DIR="" + +usage() { + cat <<'EOF' +Build MAESDK Android AAR locally. + +Options: + --install-ndk Install the pinned NDK + CMake via sdkmanager. + --ndk-version Override NDK version (default: 27.0.12077973). + --cmake-version Override CMake version (default: 3.10.2.4988404). + --output-dir Output directory (default: /dist/android-aar). + --clean Run a clean build (gradle clean). + -h, --help Show help. +EOF +} + +while [[ $# -gt 0 ]]; do + case "$1" in + --install-ndk) INSTALL_NDK=1; shift ;; + --clean) CLEAN=1; shift ;; + --ndk-version) NDK_VERSION="${2:?}"; shift 2 ;; + --cmake-version) CMAKE_VERSION="${2:?}"; shift 2 ;; + --output-dir) OUTPUT_DIR="${2:?}"; shift 2 ;; + -h|--help) usage; exit 0 ;; + *) echo "Unknown arg: $1" >&2; usage; exit 2 ;; + esac +done + +# Resolve repo root (works whether invoked from repo root or elsewhere). +SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +REPO_ROOT="$(cd -- "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd)" + +ANDROID_BUILD_DIR="${REPO_ROOT}/lib/android_build" +MAESDK_DIR="${ANDROID_BUILD_DIR}/maesdk" +VERSION_HEADER="${REPO_ROOT}/lib/include/public/Version.hpp" + +if [[ ! -d "$ANDROID_BUILD_DIR" ]]; then + echo "Expected Android build directory not found: $ANDROID_BUILD_DIR" >&2 + exit 1 +fi +if [[ ! -f "$VERSION_HEADER" ]]; then + echo "Expected version header not found: $VERSION_HEADER" >&2 + exit 1 +fi + +if [[ -z "$OUTPUT_DIR" ]]; then + OUTPUT_DIR="${REPO_ROOT}/dist/android-aar" +fi + +# Extract BUILD_VERSION_STR from Version.hpp (matches the CI workflow logic). +MAESDK_VERSION="$(sed -n 's/.*BUILD_VERSION_STR "\(.*\)"/\1/p' < "$VERSION_HEADER" | head -n 1)" +if [[ -z "$MAESDK_VERSION" ]]; then + echo "Failed to parse BUILD_VERSION_STR from: $VERSION_HEADER" >&2 + exit 1 +fi + +if command -v git >/dev/null 2>&1 && git -C "$REPO_ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then + SHORT_HASH="$(git -C "$REPO_ROOT" rev-parse --short HEAD)" +else + SHORT_HASH="nogit" +fi + +echo "==> Repo: $REPO_ROOT" +echo "==> Version: $MAESDK_VERSION" +echo "==> Short hash: $SHORT_HASH" +echo "==> Output: $OUTPUT_DIR" + +if [[ $INSTALL_NDK -eq 1 ]]; then + ANDROID_SDK_ROOT_EFFECTIVE="${ANDROID_SDK_ROOT:-${ANDROID_HOME:-}}" + if [[ -z "$ANDROID_SDK_ROOT_EFFECTIVE" ]]; then + echo "ANDROID_SDK_ROOT (or ANDROID_HOME) must be set for --install-ndk" >&2 + exit 1 + fi + + SDKMANAGER="${ANDROID_SDK_ROOT_EFFECTIVE}/cmdline-tools/latest/bin/sdkmanager" + if [[ ! -x "$SDKMANAGER" ]]; then + echo "sdkmanager not found/executable at: $SDKMANAGER" >&2 + echo "Install Android SDK Command-line Tools (latest) and ensure ANDROID_SDK_ROOT is correct." >&2 + exit 1 + fi + + echo "==> Installing Android NDK $NDK_VERSION and CMake $CMAKE_VERSION (via sdkmanager)" + # Use 'yes' to auto-accept licenses. + yes | "$SDKMANAGER" --install "ndk-bundle" "cmake;${CMAKE_VERSION}" "ndk;${NDK_VERSION}" --sdk_root="${ANDROID_SDK_ROOT_EFFECTIVE}" +fi + +# CI removes ~/.m2/settings.xml to avoid an Actions-specific issue. +# Locally, this can be legitimate user config, so we only remove it if it looks like a GitHub-provided file. +if [[ -f "$HOME/.m2/settings.xml" ]]; then + if grep -q "github" "$HOME/.m2/settings.xml" 2>/dev/null; then + echo "==> Removing ~/.m2/settings.xml (contains 'github', likely CI-provided)" + rm -f "$HOME/.m2/settings.xml" + else + echo "==> Keeping ~/.m2/settings.xml (user config)" + fi +fi + +pushd "$ANDROID_BUILD_DIR" >/dev/null + +if [[ $CLEAN -eq 1 ]]; then + echo "==> Gradle clean" + ./gradlew clean +fi + +echo "==> Gradle maesdk:build" +./gradlew maesdk:build + +popd >/dev/null + +# Package artifacts similar to the CI workflow. +mkdir -p "$OUTPUT_DIR/symbols/debug" "$OUTPUT_DIR/symbols/release" + +DEBUG_AAR_SRC="${MAESDK_DIR}/build/outputs/aar/maesdk-debug.aar" +RELEASE_AAR_SRC="${MAESDK_DIR}/build/outputs/aar/maesdk-release.aar" + +# Some Gradle setups publish into a 'dist' folder; tolerate that layout as a fallback. +if [[ ! -f "$DEBUG_AAR_SRC" && -f "${MAESDK_DIR}/dist/outputs/aar/maesdk-debug.aar" ]]; then + DEBUG_AAR_SRC="${MAESDK_DIR}/dist/outputs/aar/maesdk-debug.aar" +fi +if [[ ! -f "$RELEASE_AAR_SRC" && -f "${MAESDK_DIR}/dist/outputs/aar/maesdk-release.aar" ]]; then + RELEASE_AAR_SRC="${MAESDK_DIR}/dist/outputs/aar/maesdk-release.aar" +fi + +if [[ ! -f "$DEBUG_AAR_SRC" ]]; then + echo "Missing debug AAR: $DEBUG_AAR_SRC" >&2 + exit 1 +fi +if [[ ! -f "$RELEASE_AAR_SRC" ]]; then + echo "Missing release AAR: $RELEASE_AAR_SRC" >&2 + exit 1 +fi + +DEBUG_AAR_DST="${OUTPUT_DIR}/maesdk-debug-v${MAESDK_VERSION}-${SHORT_HASH}.aar" +RELEASE_AAR_DST="${OUTPUT_DIR}/maesdk-release-v${MAESDK_VERSION}-${SHORT_HASH}.aar" + +cp -f "$DEBUG_AAR_SRC" "$DEBUG_AAR_DST" +cp -f "$RELEASE_AAR_SRC" "$RELEASE_AAR_DST" + +# Copy symbols if present. +# CI uses the older CMake intermediates path; locally, newer Android Gradle Plugin versions often use 'intermediates/cxx'. + +copy_symbols_dir() { + local src_dir="$1" + local dst_dir="$2" + if [[ -d "$src_dir" ]]; then + cp -R "$src_dir"/* "$dst_dir" 2>/dev/null || true + return 0 + fi + return 1 +} + +DEBUG_SYMS_CMAKE="${MAESDK_DIR}/build/intermediates/cmake/debug/obj" +RELEASE_SYMS_CMAKE="${MAESDK_DIR}/build/intermediates/cmake/release/obj" + +DEBUG_SYMS_CXX_BASE="${MAESDK_DIR}/build/intermediates/cxx/Debug" +RELEASE_SYMS_CXX_BASE="${MAESDK_DIR}/build/intermediates/cxx/RelWithDebInfo" + +if ! copy_symbols_dir "$DEBUG_SYMS_CMAKE" "$OUTPUT_DIR/symbols/debug"; then + # Newer layout: .../intermediates/cxx/Debug//obj + if [[ -d "$DEBUG_SYMS_CXX_BASE" ]]; then + found=0 + while IFS= read -r -d '' obj_dir; do + copy_symbols_dir "$obj_dir" "$OUTPUT_DIR/symbols/debug" || true + found=1 + done < <(find "$DEBUG_SYMS_CXX_BASE" -maxdepth 2 -type d -name obj -print0 2>/dev/null || true) + [[ $found -eq 1 ]] || echo "==> Debug symbols not found under: $DEBUG_SYMS_CXX_BASE" + else + echo "==> Debug symbols dir not found (skipping): $DEBUG_SYMS_CMAKE" + fi +fi + +if ! copy_symbols_dir "$RELEASE_SYMS_CMAKE" "$OUTPUT_DIR/symbols/release"; then + if [[ -d "$RELEASE_SYMS_CXX_BASE" ]]; then + found=0 + while IFS= read -r -d '' obj_dir; do + copy_symbols_dir "$obj_dir" "$OUTPUT_DIR/symbols/release" || true + found=1 + done < <(find "$RELEASE_SYMS_CXX_BASE" -maxdepth 2 -type d -name obj -print0 2>/dev/null || true) + [[ $found -eq 1 ]] || echo "==> Release symbols not found under: $RELEASE_SYMS_CXX_BASE" + else + echo "==> Release symbols dir not found (skipping): $RELEASE_SYMS_CMAKE" + fi +fi + +echo "==> Done" +echo " $DEBUG_AAR_DST" +echo " $RELEASE_AAR_DST" +echo " $OUTPUT_DIR/symbols/"