diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-07-15 12:07:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-15 12:07:52 +0000 |
| commit | 1e81dd0a905432b0222a7cc3616b3c0d42adb864 (patch) | |
| tree | d3960c97f4ef8eb97b3d358f87c61762a710c94c | |
| parent | 0fc0daa2d7171df429e2197d3167743ed9d7a72c (diff) | |
| parent | 028ec157f05109f8f7fd49a0bf6bde373ce178f0 (diff) | |
| download | support-snap-temp-L04300000340679815.tar.gz | |
Merge "Add project directory path to build info files" into snap-temp-L04300000340679815snap-temp-L04300000340679815
| -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 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() |