Placed build info files in their own directory Bug: 135998756 Test: Output files exist in new directory. Change-Id: Idaee9119391f83f1159ce03b0de764c0a6220fc6 (cherry picked from commit 39cc7ca196a768ab2d7d7baf808cfff7f43804e9)
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt index 70177ca..031b8dd 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -70,6 +70,13 @@ import java.util.concurrent.ConcurrentHashMap /** + * Setting this property indicates that a build is being performed to check for forward + * compatibility. + */ +const val USE_MAX_DEP_VERSIONS = "useMaxDepVersions" +const val BUILD_INFO_DIR = "build-info" + +/** * A plugin which enables all of the Gradle customizations for AndroidX. * This plugin reacts to other plugins being added and adds required and optional functionality. */ @@ -521,7 +528,7 @@ CREATE_LIBRARY_BUILD_INFO_FILES_TASK, CreateLibraryBuildInfoFileTask::class.java ) { - it.outputFile.set(File(project.getDistributionDirectory(), + it.outputFile.set(File(project.getBuildInfoDirectory(), "${project.group}_${project.name}_build_info.txt")) } project.rootProject.tasks.named(CREATE_LIBRARY_BUILD_INFO_FILES_TASK).configure {
diff --git a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt index 490b619..50c2bec 100644 --- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt +++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
@@ -45,6 +45,12 @@ } /** + * Directory to put build info files for release service dependency files. + */ +fun Project.getBuildInfoDirectory(): File = + File(getDistributionDirectory(), "build-info") + +/** * Directory to put host test results so they can be consumed by the testing dashboard. */ fun Project.getHostTestResultDirectory(): File =
diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt index 83a3906..0e12bcd 100644 --- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt +++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
@@ -46,10 +46,10 @@ } private fun writeJsonToFile(info: LibraryBuildInfoFile) { - if (!project.getDistributionDirectory().exists()) { - if (!project.getDistributionDirectory().mkdirs()) { + if (!project.getBuildInfoDirectory().exists()) { + if (!project.getBuildInfoDirectory().mkdirs()) { throw RuntimeException("Failed to create " + - "output directory: ${project.getDistributionDirectory()}") + "output directory: ${project.getBuildInfoDirectory()}") } } var resolvedOutputFile: File = outputFile.get()