Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ffc21f authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android Git Automerger
Browse files

am 41ecc8b1: am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"." 

* commit '41ecc8b1':
  Avoid supported ABI list containing "unknown".
parents 23ccd216 41ecc8b1

core/java/android/os/Build.java

+6 −5
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ public class Build { 
     *

     * @hide

     */

    public static final String[] SUPPORTED_ABIS = getString("ro.product.cpu.abilist").split(",");

    public static final String[] SUPPORTED_ABIS = SystemProperties.get("ro.product.cpu.abilist")

            .split(",");



    /**

     * An ordered list of <b>32 bit</b> ABIs supported by this device. The most preferred ABI
@@ -98,8 +99,8 @@ public class Build { 
     *

     * @hide

     */

    public static final String[] SUPPORTED_32_BIT_ABIS = getString("ro.product.cpu.abilist32")

            .split(",");

    public static final String[] SUPPORTED_32_BIT_ABIS =

            SystemProperties.get("ro.product.cpu.abilist32").split(",");



    /**

     * An ordered list of <b>64 bit</b> ABIs supported by this device. The most preferred ABI
@@ -109,8 +110,8 @@ public class Build { 
     *

     * @hide

     */

    public static final String[] SUPPORTED_64_BIT_ABIS = getString("ro.product.cpu.abilist64")

            .split(",");

    public static final String[] SUPPORTED_64_BIT_ABIS =

            SystemProperties.get("ro.product.cpu.abilist64").split(",");





    /** Various version strings. */