summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-03 13:56:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-03 13:56:03 +0000
commit73f7cd98d61eded2cc3af0f672937c7a2ec5c10a (patch)
tree5966c3cbdced5a093094ef469a142f88778d15b3
parent7cb13f8a0a40f3d971a953b330f38bfcfb001c5e (diff)
parent26c6c03196be0248f3cf3e71383d89268f645bf5 (diff)
downloadbase-73f7cd98d61eded2cc3af0f672937c7a2ec5c10a.tar.gz
Merge "Fix build."
-rw-r--r--packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index e4de641e6a4b..ec87c6e75549 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -345,7 +345,7 @@ public class DefaultContainerService extends IntentService {
NativeLibraryHelper.ApkHandle handle = new NativeLibraryHelper.ApkHandle(codePath);
String[] abiList = Build.SUPPORTED_ABIS;
if (abiOverride != null) {
- abiList = new String[] { abiList };
+ abiList = new String[] { abiOverride };
} else {
try {
if (Build.SUPPORTED_64_BIT_ABIS.length > 0 &&