diff --git a/projects.conf b/projects.conf
index c07b1ddcb..406630265 100644
--- a/projects.conf
+++ b/projects.conf
@@ -15,3 +15,4 @@ ui/espresso/RecyclerViewSample
 ui/espresso/ScreenshotSample
 ui/espresso/WebBasicSample
 ui/uiautomator/BasicSample
+unit/BasicNativeAndroidTest
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/.gitignore b/unit/BasicNativeAndroidTest/.gitignore
new file mode 100644
index 000000000..4fe0aa6b1
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/.gitignore
@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea/*
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+
diff --git a/unit/BasicNativeAndroidTest/README.md b/unit/BasicNativeAndroidTest/README.md
new file mode 100644
index 000000000..3976aed3c
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/README.md
@@ -0,0 +1,19 @@
+# Basic sample for writing C/C++ GTest tests and running them on Android emulators / devices.
+
+This project uses the Gradle build system. You don't need an IDE to build and execute it but Android Studio is recommended.
+
+1. Download the project code, preferably using `git clone`.
+2. In Android Studio, select *File* | *Open...* and point to the `./build.gradle` file.
+3. Check out the relevant code:
+   * The C++ sources and tests are in `src/main/cpp`
+   * The device tests (which wrap the native tests) are in `src/androidTest/java`
+4. Create and run the Instrumented test configuration
+   * Open the `AdderTest` file, and click the run icon in the gutter, or
+   * Manually create a configuration.
+      * Open *Run* menu | *Edit Configurations*
+      * Add a new *Android Instrumented Tests* configuration
+      * Choose the `app` module
+      * Connect a device or start an emulator
+      * Run the newly created configuration
+
+If you are using Android Studio, the *Run* window will show the test results.
diff --git a/unit/BasicNativeAndroidTest/app/.gitignore b/unit/BasicNativeAndroidTest/app/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/build.gradle b/unit/BasicNativeAndroidTest/app/build.gradle
new file mode 100644
index 000000000..74e2e51bb
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/build.gradle
@@ -0,0 +1,69 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdk 32
+
+    defaultConfig {
+        applicationId "com.example.android.testing.nativesample"
+        minSdk 18
+        targetSdk 32
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+        }
+    }
+
+    buildFeatures {
+        prefab true
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    testOptions {
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneApi30DebugAndroidTest
+                nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = 30
+                    // Also use the AOSP ATD image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation "junit:junit:$rootProject.junitVersion"
+    implementation "androidx.test.ext:junit-gtest:$rootProject.junitGtestVersion"
+    implementation "com.android.ndk.thirdparty:googletest:$rootProject.googletestVersion"
+    androidTestImplementation "androidx.test:runner:$rootProject.runnerVersion"
+    androidTestImplementation "androidx.test.ext:junit-ktx:$extJUnitVersion"
+}
diff --git a/unit/BasicNativeAndroidTest/app/proguard-rules.pro b/unit/BasicNativeAndroidTest/app/proguard-rules.pro
new file mode 100644
index 000000000..cf504086a
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/proguard-rules.pro
@@ -0,0 +1,22 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
diff --git a/unit/BasicNativeAndroidTest/app/src/androidTest/java/com/example/android/testing/nativesample/AdderTest.kt b/unit/BasicNativeAndroidTest/app/src/androidTest/java/com/example/android/testing/nativesample/AdderTest.kt
new file mode 100644
index 000000000..e8525ffb1
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/androidTest/java/com/example/android/testing/nativesample/AdderTest.kt
@@ -0,0 +1,12 @@
+package com.example.android.testing.nativesample
+
+import androidx.test.ext.junitgtest.GtestRunner
+import androidx.test.ext.junitgtest.TargetLibrary
+import org.junit.runner.RunWith
+
+
+// Run our tests with the `GtestRunner`, which knows how to load and run GTest suites.
+@RunWith(GtestRunner::class)
+// Specify the name of the artifact which contains our tests, as configured in CMakeLists.txt
+@TargetLibrary(libraryName = "adder-test")
+class AdderTest
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/src/main/AndroidManifest.xml b/unit/BasicNativeAndroidTest/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..192528152
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.testing.nativesample">
+  <application>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/src/main/cpp/CMakeLists.txt b/unit/BasicNativeAndroidTest/app/src/main/cpp/CMakeLists.txt
new file mode 100644
index 000000000..7d7da9dff
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.10.2)
+
+project(junit-gtest-example LANGUAGES CXX)
+
+find_package(googletest REQUIRED CONFIG)
+find_package(junit-gtest REQUIRED CONFIG)
+
+include_directories(include)
+
+add_library(adder SHARED src/adder.cpp)
+
+add_library(adder-test SHARED test/adder_test.cpp)
+
+target_link_libraries(adder-test
+        PRIVATE
+        adder
+        googletest::gtest
+        junit-gtest::junit-gtest
+)
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/src/main/cpp/include/adder b/unit/BasicNativeAndroidTest/app/src/main/cpp/include/adder
new file mode 100644
index 000000000..68294be80
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/main/cpp/include/adder
@@ -0,0 +1 @@
+int add(int a, int b);
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/src/main/cpp/src/adder.cpp b/unit/BasicNativeAndroidTest/app/src/main/cpp/src/adder.cpp
new file mode 100644
index 000000000..082fc1e6f
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/main/cpp/src/adder.cpp
@@ -0,0 +1,3 @@
+int add(int a, int b) {
+    return a + b;
+}
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/app/src/main/cpp/test/adder_test.cpp b/unit/BasicNativeAndroidTest/app/src/main/cpp/test/adder_test.cpp
new file mode 100644
index 000000000..f1c91493d
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/app/src/main/cpp/test/adder_test.cpp
@@ -0,0 +1,10 @@
+#include "adder"
+#include "gtest/gtest.h"
+
+TEST(adder, pass) {
+    ASSERT_EQ(42, add(40, 2));
+}
+
+TEST(foo, fail) {
+    ASSERT_EQ(-42, add(-40, -2));
+}
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle
new file mode 100644
index 000000000..92b015944
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/build.gradle
@@ -0,0 +1,34 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    ext.agpVersion = '7.3.0-beta01'
+    ext.kotlinVersion = "1.6.10"
+    ext.androidxCoreVersion = "1.6.0"
+    ext.buildToolsVersion = "31.0.0"
+    ext.androidxCompatVersion = "1.3.1"
+    ext.coreVersion = "1.4.1-alpha06"
+    ext.extJUnitVersion = "1.1.4-alpha06"
+    ext.runnerVersion = "1.5.0-alpha03"
+    ext.rulesVersion = "1.4.1-alpha06"
+    ext.espressoVersion = "3.5.0-alpha06"
+    ext.servicesVersion = "1.4.2-alpha03"
+    ext.truthVersion = "1.1.3"
+    ext.googletestVersion = "1.11.0-beta-1"
+    ext.junitGtestVersion = "1.0.0-alpha01"
+    ext.junitVersion = "4.13.2"
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/unit/BasicNativeAndroidTest/gradle.properties b/unit/BasicNativeAndroidTest/gradle.properties
new file mode 100644
index 000000000..252175276
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/gradle.properties
@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
\ No newline at end of file
diff --git a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.jar b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..e708b1c02
Binary files /dev/null and b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..8aaf1fcaa
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Sep 30 12:30:46 PDT 2021
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/unit/BasicNativeAndroidTest/gradlew b/unit/BasicNativeAndroidTest/gradlew
new file mode 100755
index 000000000..4f906e0c8
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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 UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+  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"
+    which java >/dev/null 2>&1 || 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
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/unit/BasicNativeAndroidTest/gradlew.bat b/unit/BasicNativeAndroidTest/gradlew.bat
new file mode 100644
index 000000000..ac1b06f93
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/gradlew.bat
@@ -0,0 +1,89 @@
+@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=.
+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%" == "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%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/unit/BasicNativeAndroidTest/settings.gradle b/unit/BasicNativeAndroidTest/settings.gradle
new file mode 100644
index 000000000..cad1aede2
--- /dev/null
+++ b/unit/BasicNativeAndroidTest/settings.gradle
@@ -0,0 +1,9 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "BasicNativeAndroidTest"
+include ':app'