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

Commit 41ec8c96 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Gerrit Code Review
Browse files

Merge "Avoid supported ABI list containing "unknown"."

parents b7d7cbc9 da8c037c

core/java/android/os/Build.java

+6 −5
Original line number Diff line number Diff line
@@ -83,7 +83,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
@@ -93,8 +94,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
@@ -104,8 +105,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. */