commit d2ec8724d2a3407e28161299d44e2e113fe437ec
author Narayan Kamath <narayan@google.com> Thu May 01 14:01:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 14:01:14 2014 +0000
tree 4d48530350df55c39aa9db2b26e8f0f2fcb7ceab
parent f5c6a1b3eb10f0374fcbab55853f400778f0f8e7
parent d85ded890d86d454a0571c63911ff911633e3a95

am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."

* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
  Fix OEM native library path bug.

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 1dc53d3..7efd242 100755
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -5286,7 +5286,7 @@
         if (FileUtils.contains(Environment.getRootDirectory(), codePath)) {
             codeRoot = Environment.getRootDirectory();
         } else if (FileUtils.contains(Environment.getOemDirectory(), codePath)) {
-            codeRoot = Environment.getRootDirectory();
+            codeRoot = Environment.getOemDirectory();
         } else if (FileUtils.contains(Environment.getVendorDirectory(), codePath)) {
             codeRoot = Environment.getVendorDirectory();
         } else {