summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2014-06-14 09:05:57 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-14 09:05:57 +0000
commit5f20e1ae8df262ac777944f00b685f0cf2fe4458 (patch)
tree0e3d26ce16522d27735b6d458d5791f14aa42ad9
parent61eb51b8f5fb9d747ce5e06c0799f81ff8ddac16 (diff)
parent23315095f1d1f647311ad0fcf05ddb152ad9452d (diff)
am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"
* commit '23315095f1d1f647311ad0fcf05ddb152ad9452d': update mLastSlash for gdbserver
-rw-r--r--core/jni/com_android_internal_content_NativeLibraryHelper.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
index 8cb897e629a8..1722138ec915 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -327,6 +327,7 @@ public:
// Exception: If we find the gdbserver binary, return it.
if (!strncmp(lastSlash + 1, GDBSERVER, GDBSERVER_LEN)) {
+ mLastSlash = lastSlash;
break;
}