diff options
| author | Fisher Jomo <jomof@google.com> | 2022-02-25 10:16:30 -0800 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-01 16:39:10 +0000 |
| commit | 4a685157045374041d4a7c07362bacdbcc249a12 (patch) | |
| tree | 5f5ba03b8cfaaaf4efc69c471587d3f7f5a3bb5c /android/testSrc | |
| parent | d9ec9c0cbc98b581400f40bad3da85159cf3c9cc (diff) | |
| download | idea-4a685157045374041d4a7c07362bacdbcc249a12.tar.gz | |
Remove hardcoded NDK version in basicCMakeApp
Bug: NA
Test: NA
Change-Id: Ia4ec61922988a46ea9bd37239b48038394ab5945
Diffstat (limited to 'android/testSrc')
3 files changed, 5 insertions, 3 deletions
diff --git a/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncIntegrationTest.java b/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncIntegrationTest.java index 215095ba5e5..acefaa58ac1 100644 --- a/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncIntegrationTest.java +++ b/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncIntegrationTest.java @@ -362,7 +362,7 @@ public final class GradleSyncIntegrationTest extends GradleSyncIntegrationTestCa GradleSyncMessagesStub syncMessages = GradleSyncMessagesStub.replaceSyncMessagesService(project); // DEPENDENT_MODULES project has two modules, app and lib, app module has dependency on lib module. - prepareProjectForImport(DEPENDENT_MODULES, null, null, null); + prepareProjectForImport(DEPENDENT_MODULES, null, null, null, null); // Define new buildType qa in app module. // This causes sync issues, because app depends on lib module, but lib module doesn't have buildType qa. File appBuildFile = getBuildFilePath("app"); @@ -780,7 +780,7 @@ public final class GradleSyncIntegrationTest extends GradleSyncIntegrationTestCa } public void testUnresolvedDependency() throws Exception { - prepareProjectForImport(SIMPLE_APPLICATION_UNRESOLVED_DEPENDENCY, null, null, null); + prepareProjectForImport(SIMPLE_APPLICATION_UNRESOLVED_DEPENDENCY, null, null, null, null); GradleSyncMessagesStub syncMessages = GradleSyncMessagesStub.replaceSyncMessagesService(getProject()); Project project = getProject(); diff --git a/android/testSrc/com/android/tools/idea/gradle/project/sync/perf/GradleSyncPerfTest.java b/android/testSrc/com/android/tools/idea/gradle/project/sync/perf/GradleSyncPerfTest.java index aabf9f32c34..29992e050f4 100644 --- a/android/testSrc/com/android/tools/idea/gradle/project/sync/perf/GradleSyncPerfTest.java +++ b/android/testSrc/com/android/tools/idea/gradle/project/sync/perf/GradleSyncPerfTest.java @@ -116,6 +116,7 @@ public class GradleSyncPerfTest extends AndroidGradleTestCase { @Nullable String gradleVersion, @Nullable String gradlePluginVersion, @Nullable String kotlinVersion, + @Nullable String ndkVersion, File... localRepos) throws IOException { // Override settings just for tests (e.g. sdk.dir) diff --git a/android/testSrc/com/android/tools/idea/gradle/structure/model/PsModuleCollectionTest.kt b/android/testSrc/com/android/tools/idea/gradle/structure/model/PsModuleCollectionTest.kt index 2f627be7c3e..abc6aa569bd 100644 --- a/android/testSrc/com/android/tools/idea/gradle/structure/model/PsModuleCollectionTest.kt +++ b/android/testSrc/com/android/tools/idea/gradle/structure/model/PsModuleCollectionTest.kt @@ -43,8 +43,9 @@ class PsModuleCollectionTest : DependencyTestCase() { gradleVersion: String?, graldePluginVersion: String?, kotlinVersion: String?, + ndkVersion: String?, vararg localRepos: File) { - AndroidGradleTests.defaultPatchPreparedProject(projectRoot, gradleVersion, graldePluginVersion, kotlinVersion, *localRepos) + AndroidGradleTests.defaultPatchPreparedProject(projectRoot, gradleVersion, graldePluginVersion, kotlinVersion, ndkVersion, *localRepos) synchronizeTempDirVfs(project.baseDir) patchProject?.run { ApplicationManager.getApplication().runWriteAction { |