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

Commit 26c6c031 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Fix build. 

Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
parent 7cb13f8a

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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 &&