tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hardcoded ccache Android build config (#3041)

Browse Source
This commit is contained in:
Bart Louwers
2024-11-26 14:32:47 +01:00
committed by GitHub
parent 7e1e1fbf06
commit ed8444433f
25 changed files with 652 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/android-build-and-upload-render-test/action.yml vendored
View File

@@ -10,7 +10,7 @@ runs:
- name: Build APK and Android Test APK for ${{ inputs.flavor }}
shell: bash
run: |
./gradlew assemble${{ inputs.flavor }} assemble${{ inputs.flavor }}AndroidTest
./gradlew assemble${{ inputs.flavor }}Release assemble${{ inputs.flavor }}AndroidTest
cp app/build/outputs/apk/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release.apk RenderTestsApp-${{ inputs.flavor }}.apk
cp app/build/outputs/apk/androidTest/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release-androidTest.apk RenderTests-${{ inputs.flavor }}.apk
working-directory: ./render-test/android

46
.github/workflows/android-release.yml vendored
View File

@@ -55,56 +55,10 @@ jobs:
working-directory: platform/android
shell: bash
- name: Cache node modules
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: npm install
run: npm install --ignore-scripts
working-directory: platform/android
- name: Install ccache
run: sudo apt-get install -y ccache
- name: Prepare ccache
run: ccache --clear
- name: Cache ccache
uses: actions/cache@v4
env:
cache-name: ccache-v1
with:
path: ~/.ccache'
key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}-${{ github.head_ref }}
restore-keys: |
${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}
${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}
- name: Clear ccache statistics
run: |
ccache --zero-stats
ccache --max-size=2G
ccache --show-stats
- name: restore-gradle-cache
uses: actions/cache@v4
env:
cache-name: gradle-v1
with:
path: ~/.gradle'
key: ${{ env.cache-name }}-${{ hashFiles('platform/android/gradle/dependencies.gradle') }}-${{ hashFiles('platform/android/build.gradle') }}-${{ hashFiles('platform/android/local.properties') }}-${{ hashFiles('platform/android/gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
- ${{ env.cache-name }}
- name: Android nitpick
run: make run-android-nitpick

9
.gitignore vendored
View File

@@ -1,7 +1,7 @@
/mapbox-gl-native-android/MapLibreAndroid/mapbox-gl-native
/mapbox-gl-native-android/MapLibreAndroidTestApp/mapbox-gl-native
/platform/android/MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
/platform/android/local.properties
/platform/android/gradle/configuration.gradle
/platform/android/arm64-v8a
/platform/android/armeabi-v7a
@@ -9,8 +9,6 @@
/platform/android/MapLibreAndroid/build
/platform/android/MapLibreAndroidTestApp/.cxx
/platform/android/MapLibreAndroidTestApp/build
/platform/android/.gradle
/platform/android/buildSrc/.gradle
/platform/android/buildSrc/build
/platform/android/x86
/platform/android/x86_64
@@ -21,13 +19,14 @@
/platform/windows/vendor/mesa3d/
*.code-workspace
local.properties
.gradle
.DS_Store
.cache
compile_commands.json
/build
**/.idea
**/.clwb
/platform/android/MapLibreAndroidTestApp/local.properties
/new_offline.db
*.gpg
/.vscode
@@ -61,5 +60,3 @@ cache.sqlite-journal
out.png
/test/android/app/.cxx
/test/android/app/build
/test/android/local.properties
/render-test/android/local.properties

1
platform/android/MapLibreAndroid/build.gradle.kts
View File

@@ -12,6 +12,7 @@ plugins {
id("maplibre.android-nitpick")
id("maplibre.gradle-publish")
id("maplibre.artifact-settings")
id("org.maplibre.ccache-plugin")
}
dependencies {

25
platform/android/MapLibrePlugin/build.gradle.kts Normal file
View File

@@ -0,0 +1,25 @@
repositories {
google()
mavenCentral()
}
plugins {
`java-gradle-plugin`
`kotlin-dsl`
}
dependencies {
implementation("com.android.tools.build:gradle:8.6.1")
}
group = "org.maplibre"
version = "0.0.1"
gradlePlugin {
plugins {
create("cmakePlugin") {
id = "org.maplibre.ccache-plugin"
implementationClass = "org.maplibre.CcachePlugin"
}
}
}

BIN
platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

7
platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

249
platform/android/MapLibrePlugin/gradlew vendored Executable file
View File

@@ -0,0 +1,249 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# 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/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
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
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# 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" \
-classpath "$CLASSPATH" \
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.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

92
platform/android/MapLibrePlugin/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
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!
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
:omega

1
platform/android/MapLibrePlugin/settings.gradle.kts Normal file
View File

@@ -0,0 +1 @@
rootProject.name = "maplibre-plugin"

61
platform/android/MapLibrePlugin/src/main/kotlin/org/maplibre/CcachePlugin.kt Normal file
View File

@@ -0,0 +1,61 @@
package org.maplibre
import com.android.build.gradle.BaseExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType
import java.io.File
fun configureCcache(project: Project) {
project.extensions.getByType<BaseExtension>().run {
defaultConfig {
externalNativeBuild {
cmake {
val cacheToolPath = findCacheToolPath()
if (cacheToolPath != null) {
arguments.add("-DCMAKE_CXX_COMPILER_LAUNCHER=$cacheToolPath")
println("ccache enabled at: $cacheToolPath")
} else {
println("ccache not found on the system, continuing without it.")
}
}
}
}
}
}
fun findCacheToolPath(): String? {
val os = System.getProperty("os.name")
val ccacheCommand = if (os.startsWith("Windows")) "where ccache" else "which ccache"
val sccacheCommand = if (os.startsWith("Windows")) "where sccache" else "which sccache"
fun findCommandPath(command: String): String? {
return try {
val process = Runtime.getRuntime().exec(command)
val result = process.inputStream.bufferedReader().readText().trim()
if (process.waitFor() == 0 && result.isNotEmpty()) {
File(result).absolutePath
} else {
null
}
} catch (e: Exception) {
null
}
}
// Try to find ccache first, then fallback to sccache
return findCommandPath(ccacheCommand) ?: findCommandPath(sccacheCommand)
}
class CcachePlugin : Plugin<Project> {
override fun apply(project: Project) {
// Apply only when the appropriate Android plugin is present
project.plugins.withId("com.android.application") {
configureCcache(project)
}
project.plugins.withId("com.android.library") {
configureCcache(project)
}
}
}

9
platform/android/buildSrc/src/main/kotlin/NativeBuildPlugin.kt
View File

@@ -2,6 +2,7 @@ import com.android.build.gradle.BaseExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType
import java.io.File
open class NativeBuildPlugin : Plugin<Project> {
override fun apply(project: Project) {
@@ -65,14 +66,6 @@ fun Project.nativeBuild(nativeTargets: List<String>) =
)
)
// Enable ccache if available.
val ccachePaths = listOf("/usr/bin/ccache", "/usr/local/bin/ccache")
for (path in ccachePaths) {
if (file(path).exists()) {
arguments.add("-DANDROID_CCACHE=$path")
}
}
cFlags.add("-Qunused-arguments")
cppFlags.add("-Qunused-arguments")

3
platform/android/settings.gradle.kts
View File

@@ -16,7 +16,6 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven("https://plugins.gradle.org/m2/")
}
}
@@ -37,3 +36,5 @@ val cppTestProjectDir = file("$rootDir/../../test/android")
includeBuild(cppTestProjectDir) {
name = "cppUnitTestsApp"
}
includeBuild("./MapLibrePlugin")

79
render-test/android/app/build.gradle
View File

@@ -1,79 +0,0 @@
apply plugin: 'com.android.application'
//apply from: "${rootDir}/../../platform/android/gradle/download-vulkan-validation.gradle"
android {
ndkVersion '27.0.12077973'
sourceSets {
test {
assets.srcDirs += ['../../../metrics']
}
}
defaultConfig {
applicationId = 'org.maplibre.render_test_runner'
compileSdk 34
minSdkVersion 21
targetSdkVersion 33
def abi = 'all'
if (project.hasProperty('maplibre.abis')) {
abi = project.getProperty('maplibre.abis')
}
ndk {
if (abi != 'all' && abi != 'none') {
abiFilters abi.split(' ')
} else {
abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
}
}
externalNativeBuild {
cmake {
arguments '-DANDROID_CCACHE=ccache'
arguments '-DANDROID_STL=c++_static'
arguments "-DMLN_LEGACY_RENDERER=OFF", "-DMLN_DRAWABLE_RENDERER=ON"
targets 'mbgl-render-test-runner'
}
}
android {
testBuildType 'release'
}
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
externalNativeBuild {
cmake {
version '3.19.0+'
path '../../../CMakeLists.txt'
}
}
buildTypes {
release {
signingConfig signingConfigs.debug
}
}
flavorDimensions += "renderer"
productFlavors {
create("opengl") {
dimension = "renderer"
}
create("vulkan") {
dimension = "renderer"
externalNativeBuild {
cmake {
arguments "-DMLN_WITH_OPENGL=OFF", "-DMLN_WITH_VULKAN=ON"
}
}
}
}
namespace 'android.app'
}
dependencies {
implementation libs.supportConstraintLayout
androidTestImplementation libs.testRunner
androidTestImplementation libs.testEspressoCore
androidTestImplementation libs.testRules
}

85
render-test/android/app/build.gradle.kts Normal file
View File

@@ -0,0 +1,85 @@
plugins {
id("com.android.application")
id("org.maplibre.ccache-plugin")
}
android {
ndkVersion = "27.0.12077973"
sourceSets {
getByName("test") {
assets.srcDirs("../../../metrics")
}
}
defaultConfig {
applicationId = "org.maplibre.render_test_runner"
compileSdk = 34
minSdk = 21
targetSdk = 33
val abi = if (project.hasProperty("maplibre.abis")) {
project.property("maplibre.abis") as String
} else {
"all"
}
ndk {
if (abi != "all" && abi != "none") {
abiFilters.addAll(abi.split(" "))
} else {
abiFilters.addAll(listOf("armeabi-v7a", "x86", "arm64-v8a", "x86_64"))
}
}
externalNativeBuild {
cmake {
arguments("-DANDROID_STL=c++_static")
arguments("-DMLN_LEGACY_RENDERER=OFF", "-DMLN_DRAWABLE_RENDERER=ON")
targets.add("mbgl-render-test-runner")
}
}
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
externalNativeBuild {
cmake {
version = "3.19.0+"
path = file("../../../CMakeLists.txt")
}
}
buildTypes {
getByName("release") {
signingConfig = signingConfigs.getByName("debug")
}
}
flavorDimensions += "renderer"
productFlavors {
create("opengl") {
dimension = "renderer"
}
create("vulkan") {
dimension = "renderer"
externalNativeBuild {
cmake {
arguments("-DMLN_WITH_OPENGL=OFF", "-DMLN_WITH_VULKAN=ON")
}
}
}
}
namespace = "android.app"
testBuildType = "release"
}
dependencies {
implementation(libs.supportConstraintLayout)
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.testEspressoCore)
androidTestImplementation(libs.testRules)
}

16
render-test/android/build.gradle
View File

@@ -1,16 +0,0 @@
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath libs.androidGradlePlugin
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}

3
render-test/android/build.gradle.kts Normal file
View File

@@ -0,0 +1,3 @@
plugins {
id("com.android.application") version "8.6.0" apply false
}

7
render-test/android/settings.gradle
View File

@@ -1,7 +0,0 @@
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}
rootProject.name = "androidRenderTest"
include ":app"

25
render-test/android/settings.gradle.kts Normal file
View File

@@ -0,0 +1,25 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
rootProject.name = "androidRenderTest"
include(":app")
includeBuild(file("../../platform/android/MapLibrePlugin"))

58
test/android/app/build.gradle
View File

@@ -1,58 +0,0 @@
apply plugin: 'com.android.application'
android {
namespace "android.app"
buildFeatures {
prefab true
}
defaultConfig {
applicationId = 'org.maplibre.cpp_test_runner'
minSdkVersion 28
targetSdkVersion 33
compileSdk 34
def abi = 'all'
if (project.hasProperty('maplibre.abis')) {
abi = project.getProperty('maplibre.abis')
}
ndk {
if (abi != 'all' && abi != 'none') {
abiFilters abi.split(' ')
} else {
abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
}
}
externalNativeBuild {
cmake {
arguments "-DMLN_LEGACY_RENDERER=OFF", "-DMLN_DRAWABLE_RENDERER=ON"
arguments '-DANDROID_CCACHE=ccache'
arguments '-DANDROID_STL=c++_static'
targets 'mbgl-test-runner'
}
}
android {
testBuildType 'release'
}
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
externalNativeBuild {
cmake {
version "3.18.1+"
path '../../../CMakeLists.txt'
}
}
buildTypes {
release {
signingConfig signingConfigs.debug
}
}
}
dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test:rules:1.6.1'
implementation 'io.github.vvb2060.ndk:curl:8.8.0'
}

68
test/android/app/build.gradle.kts Normal file
View File

@@ -0,0 +1,68 @@
plugins {
id("com.android.application")
id("org.maplibre.ccache-plugin")
}
android {
namespace = "android.app"
buildFeatures {
prefab = true
}
defaultConfig {
applicationId = "org.maplibre.cpp_test_runner"
minSdk = 28
targetSdk = 33
compileSdk = 34
val abi = if (project.hasProperty("maplibre.abis")) {
project.property("maplibre.abis") as String
} else {
"all"
}
ndk {
if (abi != "all" && abi != "none") {
abiFilters += abi.split(" ")
} else {
abiFilters += listOf("armeabi-v7a", "x86", "arm64-v8a", "x86_64")
}
}
externalNativeBuild {
cmake {
arguments += listOf(
"-DMLN_LEGACY_RENDERER=OFF",
"-DMLN_DRAWABLE_RENDERER=ON",
"-DANDROID_STL=c++_static"
)
targets += "mbgl-test-runner"
}
}
testBuildType = "release"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
externalNativeBuild {
cmake {
version = "3.18.1+"
path = file("../../../CMakeLists.txt")
}
}
buildTypes {
getByName("release") {
signingConfig = signingConfigs.getByName("debug")
}
}
}
dependencies {
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation("androidx.test:rules:1.6.1")
implementation("io.github.vvb2060.ndk:curl:8.8.0")
}

21
test/android/build.gradle
View File

@@ -1,21 +0,0 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.6.0'
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

3
test/android/build.gradle.kts Normal file
View File

@@ -0,0 +1,3 @@
plugins {
id("com.android.application") version "8.6.0" apply false
}

8
test/android/settings.gradle
View File

@@ -1,8 +0,0 @@
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}
rootProject.name = "androidCppUnitTests"
include ':app'

25
test/android/settings.gradle.kts Normal file
View File

@@ -0,0 +1,25 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
rootProject.name = "androidCppUnitTests"
include(":app")
includeBuild(file("../../platform/android/MapLibrePlugin"))