diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 718913fc9..8c6f0179c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -50,7 +50,6 @@ jobs: target: default arch: x86_64 profile: pixel_2 - ndk: 21.4.7075529 ram-size: '4096M' disk-size: '14G' sdcard-path-or-size: '1000M' @@ -67,7 +66,6 @@ jobs: target: google_apis arch: x86_64 profile: pixel_2 - ndk: 21.4.7075529 ram-size: '4096M' disk-size: '14G' sdcard-path-or-size: '1000M' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 04da2d272..961a410d6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -43,7 +43,6 @@ jobs: target: ${{ matrix.target }} arch: x86_64 profile: pixel_2 - ndk: 21.4.7075529 sdcard-path-or-size: '1000M' disable-animations: false script: bash contrib/instrumentation_nightly.sh @@ -69,9 +68,6 @@ jobs: with: java-version: 11 - - name: Install NDK - run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.0.7026061" --sdk_root=${ANDROID_SDK_ROOT} - - name: run unit tests run: ./gradlew testDebugUnitTest testCustomExampleDebugUnitTest diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a22d929cd..0badceb59 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -131,9 +131,6 @@ jobs: with: java-version: 11 - - name: Install NDK - run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.0.7026061" --sdk_root=${ANDROID_SDK_ROOT} - - name: Build all configurations run: ./gradlew assemble diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt index b230907e7..c836dcec1 100644 --- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt @@ -46,7 +46,6 @@ class AllProjectConfigurer { fun configureBaseExtension(target: Project, path: String) { target.configureExtension { setCompileSdkVersion(Config.compileSdk) - ndkVersion = "21.4.7075529" defaultConfig { setMinSdkVersion(Config.minSdk) setTargetSdkVersion(Config.targetSdk)