From 6a9526a133b502fd85b2b1ce1ac0263e944e1d05 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Fri, 8 Mar 2024 09:18:49 +0100
Subject: [PATCH] Migrate BuildConfig to gradle files

---
 application/donations/build.gradle       | 1 +
 application/live-plot-graph/build.gradle | 3 +++
 application/moviepedia/build.gradle      | 3 +++
 application/resources/build.gradle       | 3 +++
 application/tools/build.gradle           | 3 +++
 application/vlc-android/build.gradle     | 1 +
 application/webserver/build.gradle       | 3 +++
 buildsystem/compile.sh                   | 4 ++--
 gradle.properties                        | 1 -
 9 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index 5194fdbde..988fe9945 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -64,6 +64,7 @@ android {
     namespace 'org.videolan.vlc.donations'
     buildFeatures {
         aidl true
+        buildConfig true
     }
 }
 
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index fad7cc642..70fccd347 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -43,6 +43,9 @@ android {
         }
     }
     namespace 'org.videolan.liveplotgraph'
+    buildFeatures {
+        buildConfig true
+    }
 
 }
 
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index c872c874b..e0373d2a3 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -41,6 +41,9 @@ android {
         }
     }
     namespace 'org.videolan.moviepedia'
+    buildFeatures {
+        buildConfig true
+    }
 
 }
 
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index 26c7b02e1..bbd97e78e 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -44,6 +44,9 @@ android {
         res.srcDirs = ['flavors/debug/res']
     }
     namespace 'org.videolan.resources'
+    buildFeatures {
+        buildConfig true
+    }
 
 }
 dependencies {
diff --git a/application/tools/build.gradle b/application/tools/build.gradle
index a3ccec99b..faab26647 100644
--- a/application/tools/build.gradle
+++ b/application/tools/build.gradle
@@ -19,6 +19,9 @@ android {
         }
     }
     namespace 'videolan.org.commontools'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 0031a7964..84c8dfde8 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -113,6 +113,7 @@ android {
     buildFeatures {
         renderScript true
         aidl true
+        buildConfig true
     }
 }
 
diff --git a/application/webserver/build.gradle b/application/webserver/build.gradle
index dc0e6305c..086b3b403 100644
--- a/application/webserver/build.gradle
+++ b/application/webserver/build.gradle
@@ -54,6 +54,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 preBuild.dependsOn(webCopy)
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 6e3a2080d..b3c66ccf8 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -261,9 +261,9 @@ fi
 
 
 if [ "$FORCE_VLC_4" = 1 ]; then
-    LIBVLCJNI_TESTED_HASH=e7d9bf62834c36c92a3724f895dce45362aceb49
+    LIBVLCJNI_TESTED_HASH=6337b790b501a9c132fdc7ec1a0c04313738cd96
 else
-    LIBVLCJNI_TESTED_HASH=13d22717b6af57fe1e4fe43e2250c30cffd77e3d
+    LIBVLCJNI_TESTED_HASH=24c0047f5697cc96e89ac86e2557ce319fc43c86
 fi
 LIBVLCJNI_REPOSITORY=https://code.videolan.org/videolan/libvlcjni
 
diff --git a/gradle.properties b/gradle.properties
index afecfe82e..40f58c35f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,6 @@ POM_DEVELOPER_NAME=VideoLAN
 POM_DEVELOPER_URL=https://www.videolan.org/
 
 RELEASE_SIGNING_ENABLED=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false