[Android] Remove ABI from app resources

Geoffrey Métais git at videolan.org
Tue Dec 18 14:55:57 CET 2018


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Dec 18 14:54:47 2018 +0100| [9d403a2fce6c560edcc977f041a405d5bb034711] | committer: Geoffrey Métais

Remove ABI from app resources

Gradle applies changes per variant, which causes every build to have the
same value "x86_64"

> https://code.videolan.org/videolan/vlc-android/commit/9d403a2fce6c560edcc977f041a405d5bb034711
---

 vlc-android/build.gradle                                  | 1 -
 vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index b4a7be4e1..c5a17f83c 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -160,7 +160,6 @@ android {
             def outputName = "VLC-Android-"
             outputName += variant.versionName + "-" + abiName + ".apk"
             output.outputFileName = outputName
-            resValue "string", "build_abi", abiName
         }
     }
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java b/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
index 4587e1e42..937264ae0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
@@ -236,7 +236,7 @@ public class UiTools {
         final TextView compiled = v.findViewById(R.id.main_compiled);
         compiled.setText(builder + " (" + builddate + ")");
         final TextView textview_rev = v.findViewById(R.id.main_revision);
-        textview_rev.setText(v.getContext().getString(R.string.revision) + " " + revision + " (" + builddate + ") " + v.getContext().getString(R.string.build_abi));
+        textview_rev.setText(v.getContext().getString(R.string.revision) + " " + revision + " (" + builddate + ") ");
 
         final ImageView logo = v.findViewById(R.id.logo);
         logo.setOnClickListener(new View.OnClickListener() {



More information about the Android mailing list