commit ca238e572d9c96a6cc556eb873ae8fa5959197e5
author Sam Saccone <samccone@google.com> Thu Dec 02 19:08:59 2021 +0000
committer Sam Saccone <samccone@google.com> Thu Dec 02 19:08:59 2021 +0000
tree 4957bd0ce1d763cb52fd552809fa9ae143990bc4
parent ed3dce960260662fee0f29c573d27330f845c7d5

Revert "Fix the API level calculation for release builds"

This reverts commit ed3dce960260662fee0f29c573d27330f845c7d5.

Reason for revert: direct to release submit.

Change-Id: I24c0293ca4864e798423cf002da8edc21040aa3d

src/main/java/com/android/tools/metalava/Driver.kt

diff --git a/src/main/java/com/android/tools/metalava/Driver.kt b/src/main/java/com/android/tools/metalava/Driver.kt
index fd33bdd..47dac44 100644
--- a/src/main/java/com/android/tools/metalava/Driver.kt
+++ b/src/main/java/com/android/tools/metalava/Driver.kt
@@ -883,8 +883,7 @@
     javaLanguageLevel: LanguageLevel = options.javaLanguageLevel,
     kotlinLanguageLevel: LanguageVersionSettings = options.kotlinLanguageLevel,
     manifest: File? = options.manifest,
-    currentApiLevel: Int = options.currentApiLevel +
-      if (options.currentCodeName != null && "REL" != options.currentCodeName) 1 else 0
+    currentApiLevel: Int = options.currentApiLevel + if (options.currentCodeName != null) 1 else 0
 ): PsiBasedCodebase {
     val sourceRoots = mutableListOf<File>()
     sourcePath.filterTo(sourceRoots) { it.path.isNotBlank() }