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

* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
  Avoid supported ABI list containing "unknown".
This commit is contained in:
Torne (Richard Coles)
2014-05-14 15:31:28 +00:00
committed by Android Git Automerger

View File

@@ -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. */