Skip to content
Snippets Groups Projects

Fix the vlc hash generation and add a libvlcjni revision string

Merged Nicolas Pomepuy requested to merge Aza/libvlcjni:vlc_hash into master
1 file
+ 11
1
Compare changes
  • Side-by-side
  • Inline
+ 11
1
@@ -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
}
Loading