summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kenny Root <kroot@google.com> 2010-09-30 14:30:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-30 14:30:14 -0700
commitaff30c9b0db2c4e28afbe83436ab9024b67665cf (patch)
tree087e5fc9c224febda982dba0a2e828cd745267d8
parent53b070275568af0d1016e019fdf0aa1ed28665f1 (diff)
parent99f8c5ee621d78a24583a10e459ba40aab511a17 (diff)
am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp * commit '99f8c5ee621d78a24583a10e459ba40aab511a17': Fix location of gdbserver upon installation
-rw-r--r--core/java/com/android/internal/content/NativeLibraryHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java
index 6e11cff2c208..2a8cd94a21e0 100644
--- a/core/java/com/android/internal/content/NativeLibraryHelper.java
+++ b/core/java/com/android/internal/content/NativeLibraryHelper.java
@@ -180,7 +180,7 @@ public class NativeLibraryHelper {
Log.d(TAG, "Found gdbserver: " + entry.getName());
}
- final String installGdbServerPath = APK_LIB + GDBSERVER;
+ final String installGdbServerPath = GDBSERVER;
nativeFiles.add(Pair.create(entry, installGdbServerPath));
return PACKAGE_INSTALL_NATIVE_FOUND_LIBRARIES;