Merge "Fix build."

This commit is contained in:
Narayan Kamath
2014-06-03 13:56:03 +00:00
committed by Gerrit Code Review

View File

@@ -345,7 +345,7 @@ public class DefaultContainerService extends IntentService {
NativeLibraryHelper.ApkHandle handle = new NativeLibraryHelper.ApkHandle(codePath); NativeLibraryHelper.ApkHandle handle = new NativeLibraryHelper.ApkHandle(codePath);
String[] abiList = Build.SUPPORTED_ABIS; String[] abiList = Build.SUPPORTED_ABIS;
if (abiOverride != null) { if (abiOverride != null) {
abiList = new String[] { abiList }; abiList = new String[] { abiOverride };
} else { } else {
try { try {
if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && if (Build.SUPPORTED_64_BIT_ABIS.length > 0 &&