Minor. Update tests to support them on Android

compiler/android-tests/android-module/build.gradle

@@ -71,6 +71,10 @@ android {
         ktest1 {
             dimension "box"
         }
+
+        ktest2 {
+            dimension "box"
+        }
     }
 
 }
@@ -96,4 +100,5 @@ dependencies {
 
     ktest0Implementation fileTree(dir: 'libs/test', include: ['libtest0.jar'])
     ktest1Implementation fileTree(dir: 'libs/test', include: ['libtest1.jar'])
+    ktest2Implementation fileTree(dir: 'libs/test', include: ['libtest2.jar'])
 }

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt

@@ -138,12 +138,12 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
         private fun writeFiles(filesToCompile: List<KtFile>, environment: KotlinCoreEnvironment) {
             if (filesToCompile.isEmpty()) return
 
-            //3000 files per folder that would be used by flavor to avoid multidex usage,
+            //2500 files per folder that would be used by flavor to avoid multidex usage,
             // each folder would be jared by build.gradle script
             writtenFilesCount += filesToCompile.size
-            val index = writtenFilesCount / 3000
+            val index = writtenFilesCount / 2500
             val outputDir = File(pathManager.getOutputForCompiledFiles(index))
-            assertTrue("Add flavors for ktest$index", index < 2)
+            assertTrue("Add flavors for ktest$index", index < 3)
 
             println("Generating ${filesToCompile.size} files into ${outputDir.name}, configuration: '${environment.configuration}'...")