From 965402da3c2004dcef4f6575406ace343b2f1b15 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Thu, 11 Aug 2022 11:45:54 +0200
Subject: [PATCH] Fix the vlc hash generation and add a libvlcjni revision
 string

---
 libvlc/build.gradle | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index 03e2231..d2540ad 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -12,6 +12,7 @@ android {
         compileSdkVersion rootProject.ext.compileSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         minSdkVersion rootProject.ext.minSdkVersion
+        resValue "string", "build_libvlc_revision", libvlcRevision()
         resValue "string", "build_vlc_revision", vlcRevision()
         tasks.whenTaskAdded { task ->
             if (task.name.startsWith('merge')) {
@@ -93,7 +94,7 @@ dependencies {
     api "androidx.legacy:legacy-support-v4:$rootProject.ext.androidxLegacyVersion"
 }
 
-def vlcRevision() {
+def libvlcRevision() {
     def vlc = new ByteArrayOutputStream()
     exec {
         commandLine 'git', 'rev-parse', '--short', 'HEAD'
@@ -102,6 +103,15 @@ def vlcRevision() {
     return vlc.toString()
 }
 
+def vlcRevision() {
+    def vlc = new ByteArrayOutputStream()
+    exec {
+        commandLine 'sh', '-c', 'cd ../../vlc  && git rev-parse --short HEAD'
+        standardOutput = vlc
+    }
+    return vlc.toString()
+}
+
 mavenPublish {
     releaseSigningEnabled = false
 }
-- 
GitLab