[Android] src: Be backwards compatible

Edward Wang git at videolan.org
Wed Jul 4 01:07:39 CEST 2012


android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Tue Jul  3 19:06:19 2012 -0400| [176318b7d6ab42a9c95b0b0edefef8c9746c0e1e] | committer: Edward Wang

src: Be backwards compatible

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=176318b7d6ab42a9c95b0b0edefef8c9746c0e1e
---

 vlc-android/src/org/videolan/vlc/Util.java |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vlc-android/src/org/videolan/vlc/Util.java b/vlc-android/src/org/videolan/vlc/Util.java
index f66010a..f10b0af 100644
--- a/vlc-android/src/org/videolan/vlc/Util.java
+++ b/vlc-android/src/org/videolan/vlc/Util.java
@@ -233,8 +233,10 @@ public class Util {
             while(in.read(re) != -1){
                 if(!hasNeon && new String(re).contains("neon"))
                     hasNeon = true;
-                if(!hasArmV7 && new String(re).contains("ARMv7"))
+                if(!hasArmV7 && new String(re).contains("ARMv7")) {
                     hasArmV7 = true;
+                    hasArmV6 = true; /* Armv7 is backwards compatible to < v6 */
+                }
                 if(!hasArmV7 && !hasArmV6 && new String(re).contains("ARMv6"))
                     hasArmV6 = true;
                 if(!hasFpu && new String(re).contains("vfp"))



More information about the Android mailing list