aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-07-15 08:54:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-07-15 08:54:31 +0000
commit8c25da587a7d64b12335d29a3b642fe460ae46b4 (patch)
tree565e5e7e8095e9af01347e906f4b33e3fc6437c9
parent17fc59ba4f917085d26be657895e73b06482f891 (diff)
parent8fa5e83730b33c52b05f48d3eca48d6235a788c7 (diff)
downloadsupport-snap-temp-L08000000340496197.tar.gz
Merge "Add project directory path to build info files" into snap-temp-L08000000340496197snap-temp-L08000000340496197
-rw-r--r--buildSrc/jetpad-integration/src/main/java/androidx/build/jetpad/LibraryBuildInfoFile.java1
-rw-r--r--buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt6
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 0e12bcd3522..26c862355ff 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.getBuildInfoDirectory().exists()) {
if (!project.getBuildInfoDirectory().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()