Browse Source

Remove the notv build

merge-requests/1990/merge
Nicolas Pomepuy 2 years ago
parent
commit
2ab57d188e
  1. 9
      application/app/build.gradle
  2. 4
      application/donations/build.gradle
  3. 4
      application/live-plot-graph/build.gradle
  4. 4
      application/mediadb/build.gradle
  5. 4
      application/moviepedia/build.gradle
  6. 6
      application/resources/build.gradle
  7. 4
      application/television/build.gradle
  8. 4
      application/tools/build.gradle
  9. 5
      application/vlc-android/build.gradle
  10. 4
      application/webserver/build.gradle

9
application/app/build.gradle

@ -80,10 +80,6 @@ android {
signingConfig = signingConfigs.release
matchingFallbacks = ['release']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']
@ -125,7 +121,6 @@ android {
}
def abiCodes = ['armeabi-v7a': 5, 'arm64-v8a': 6, 'x86': 7, 'x86_64': 8]
def abiCodesNoTv = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
lint {
abortOnError false
disable 'MissingTranslation', 'ExtraTranslation'
@ -139,9 +134,6 @@ android {
def abiName = System.getenv('GRADLE_ABI')?.toLowerCase() ?: "all"
if (outputAbi != null) abiName = outputAbi
def versionCode = abiCodes.get(abiName, 0)
if (variant.buildType.name == "noTv") {
versionCode = abiCodesNoTv.get(abiName, 0)
}
if (variant.buildType.name == "vlcBundle") {
versionCode = 9
}
@ -150,7 +142,6 @@ android {
def outputName = "VLC-Android-"
outputName += variant.versionName.replace(" ", "-")
if (variant.buildType.name == "debug") outputName += "-debug"
if (variant.buildType.name == "noTv") outputName += "-no-tv"
outputName += "-" + abiName + ".apk"
output.outputFileName = outputName
}

4
application/donations/build.gradle

@ -60,10 +60,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

4
application/live-plot-graph/build.gradle

@ -41,10 +41,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

4
application/mediadb/build.gradle

@ -53,10 +53,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

4
application/moviepedia/build.gradle

@ -39,10 +39,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

6
application/resources/build.gradle

@ -30,10 +30,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']
@ -72,8 +68,6 @@ dependencies {
debugApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
releaseApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
releaseApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
noTvApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
noTvApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
vlcBundleApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
vlcBundleApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"

4
application/television/build.gradle

@ -33,10 +33,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

4
application/tools/build.gradle

@ -17,10 +17,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

5
application/vlc-android/build.gradle

@ -76,11 +76,6 @@ android {
buildConfigField "boolean", "NO_TV", "false"
multiDexEnabled true
}
noTv {
initWith release
matchingFallbacks = ['release']
buildConfigField "boolean", "NO_TV", "true"
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

4
application/webserver/build.gradle

@ -31,10 +31,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
noTv {
initWith release
matchingFallbacks = ['release']
}
vlcBundle {
initWith release
matchingFallbacks = ['release']

Loading…
Cancel
Save