commit 03119b4b5f227bee299f1efbdff8b2ce025edae8
author Narayan Kamath <narayan@google.com> Wed Jul 16 12:47:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 16 12:47:41 2014 +0000
tree b13e1719c08ffb957c765467242a31630302a956
parent ab0d796c8f1c2de9361f7a440542e7f55c29b706
parent 61e9bf246f3eacf1b11305eb86a8cb2a217adc5c

am 2998964d: Fix install --abi for apps with no native code.

* commit '2998964dabbf974e973192dc16c1606c45e0bf1e':
  Fix install --abi for apps with no native code.

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a8732dd..56b5b7e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -5485,6 +5485,8 @@
 
                     if (copyRet >= 0) {
                         pkg.applicationInfo.primaryCpuAbi = abiList[copyRet];
+                    } else if (copyRet == PackageManager.NO_NATIVE_LIBRARIES && abiOverride != null) {
+                        pkg.applicationInfo.primaryCpuAbi = abiOverride;
                     }
                 }
             } catch (IOException ioe) {