[Android] src: armeabi for ARMv6 could also be in CPU_ABI2

[Edward Wang]

android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Thu Aug  2 13:08:02 2012 -0400| [cc262289cc0d6e2f696974c5cff8a5b18caacf26] | committer: Edward Wang

src: armeabi for ARMv6 could also be in CPU_ABI2

Example of such a device:

(12:34:14 PM) <funman> ARMv6 build on non-ARMv6 device
(12:35:03 PM) <funman> ro.product.cpu.abi=armeabi-v6l
(12:35:03 PM) <funman> ro.product.cpu.abi2=armeabi

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

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

diff --git a/vlc-android/src/org/videolan/vlc/Util.java b/vlc-android/src/org/videolan/vlc/Util.java
index 866490e..77d68ce 100644
--- a/vlc-android/src/org/videolan/vlc/Util.java
+++ b/vlc-android/src/org/videolan/vlc/Util.java
@@ -245,7 +245,8 @@ public class Util {
         if(android.os.Build.CPU_ABI.equals("armeabi-v7a")) {
             hasArmV7 = true;
             hasArmV6 = true; /* Armv7 is backwards compatible to < v6 */
-        } else if(android.os.Build.CPU_ABI.equals("armeabi")) {
+        } else if(android.os.Build.CPU_ABI.equals("armeabi") ||
+                  android.os.Build.CPU_ABI2.equals("armeabi")) {
             hasArmV6 = true;
         } else if(android.os.Build.CPU_ABI.equals("x86")) {
             hasX86 = true;