diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-07-15 08:52:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-15 08:52:14 +0000 |
| commit | 55a1f2db5677b33684202a1902bc766b29ce0e28 (patch) | |
| tree | 5b93ad5726fc2511a67fa49e4ff6d06a6fc80c12 | |
| parent | 609b739be9c9a18b7776b6941b692d1a4a77561a (diff) | |
| parent | 1a4c24dcefc03987ef8fd9c77d099d762a877b56 (diff) | |
| download | support-snap-temp-L36900000340474987.tar.gz | |
Merge "Add project directory path to build info files" into snap-temp-L36900000340474987snap-temp-L36900000340474987
| -rw-r--r-- | buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java | 1 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java b/buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java index e23bf0f98cb..f78fd569a3f 100644 --- a/buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java +++ b/buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java @@ -29,6 +29,7 @@ public class LibraryBuildInfoFile { public String groupId; public String artifactId; public String version; + public String path; public ArrayList<Dependency> dependencies; public ArrayList<Check> checks; diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt index 83a390678ae..27783ecc1fc 100644 --- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt +++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt @@ -45,6 +45,11 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() { return "${project.group}_${project.name}_build_info.txt" } + /* Returns the local project directory without the full framework/support root directory path */ + private fun getProjectSpecificDirectory(): String { + return project.projectDir.toString().removePrefix(project.rootDir.toString()) + } + private fun writeJsonToFile(info: LibraryBuildInfoFile) { if (!project.getDistributionDirectory().exists()) { if (!project.getDistributionDirectory().mkdirs()) { @@ -68,6 +73,7 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() { private fun resolveAndCollectDependencies(): LibraryBuildInfoFile { val libraryBuildInfoFile = LibraryBuildInfoFile() + libraryBuildInfoFile.path = getProjectSpecificDirectory() libraryBuildInfoFile.artifactId = project.name.toString() libraryBuildInfoFile.groupId = project.group.toString() libraryBuildInfoFile.version = project.version.toString() |