Merge "Placed build info files in their own directory" into snap-temp-L21900000333346811snap-temp-L21900000333346811

3 files changed, 11 insertions, 4 deletions

diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index ec2106b5768..85b6a090750 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -80,6 +80,7 @@ import java.util.concurrent.ConcurrentHashMap
  * 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.
@@ -587,7 +588,7 @@ class AndroidXPlugin : Plugin<Project> {
                     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 b48db5c41ae..4d065ed2261 100644
--- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
@@ -46,6 +46,12 @@ fun Project.getDistributionDirectory(): File {
 }
 
 /**
+ * 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 83a390678ae..0e12bcd3522 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
@@ -46,10 +46,10 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() {
     }
 
     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()