diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-25 21:28:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-25 21:28:10 +0000 |
commit | 11fe698611d454e945a9360c6c453afc81aa7eab (patch) | |
tree | 9f876bb3421f706a052068dbec30362b8c7e384a | |
parent | eb467a0cf5a7bb58015480a9870daa8963da0f77 (diff) | |
parent | 5850d3f9f7042377de896e718f1584ab049aaa21 (diff) | |
download | support-snap-temp-L84200000333101583.tar.gz |
Merge "Placed build info files in their own directory" into snap-temp-L84200000333101583snap-temp-L84200000333101583
3 files changed, 17 insertions, 4 deletions
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt index 4e72632b8f5..95136f73564 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.io.File 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. */ @@ -522,7 +529,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 490b619eb56..50c2bec476f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt +++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt @@ -45,6 +45,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() |