Merge "Using frameworks/support for build_info.txt sha" into snap-temp-L33900000517083183snap-temp-L33900000517083183

1 files changed, 6 insertions, 3 deletions

diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
index e6da539d2d7..676de5786c6 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
@@ -68,7 +68,10 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() {
         return library?.mavenGroup?.requireSameVersion ?: false
     }
 
-    private fun getCommitShaAtHead(): String {
+    /* For androidx release notes, the most common use case is to track and publish the last sha
+     * of the build that is released.  Thus, we use frameworks/support to get the sha
+     */
+    private fun getFrameworksSupportCommitShaAtHead(): String {
         val commitList: List<Commit> = GitClientImpl(project.rootDir).getGitLog(
             GitCommitRange(
                 fromExclusive = "",
@@ -76,7 +79,7 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() {
                 n = 1
             ),
             keepMerges = true,
-            fullProjectDir = project.projectDir
+            fullProjectDir = getSupportRoot(project)
         )
         return commitList.first().sha
     }
@@ -108,7 +111,7 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() {
         libraryBuildInfoFile.groupId = project.group.toString()
         libraryBuildInfoFile.version = project.version.toString()
         libraryBuildInfoFile.path = getProjectSpecificDirectory()
-        libraryBuildInfoFile.sha = getCommitShaAtHead()
+        libraryBuildInfoFile.sha = getFrameworksSupportCommitShaAtHead()
         libraryBuildInfoFile.groupIdRequiresSameVersion = requiresSameVersion()
         val libraryDependencies = ArrayList<LibraryBuildInfoFile.Dependency>()
         val checks = ArrayList<LibraryBuildInfoFile.Check>()