Skip to content

Commit

Permalink
ndk-gdb.py: fix bad paths.
Browse files Browse the repository at this point in the history
These weren't updated for the directory reshuffling a while back.

Bug: #3
Change-Id: Ifea9be5d910a1ea2d974eb67f8a079f227d03218
(cherry picked from commit c9b170d)
  • Loading branch information
jmgao committed Mar 11, 2016
1 parent 669ade8 commit a430a75
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions ndk-gdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import logging

# Shared functions across gdbclient.py and ndk-gdb.py.
# ndk-gdb is installed to $NDK/host-tools/bin
NDK_PATH = os.path.normpath(os.path.join(os.path.dirname(__file__), '../..'))
# ndk-gdb is installed to $NDK/prebuilt/<platform>/bin
NDK_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../..'))
sys.path.append(os.path.join(NDK_PATH, "python-packages"))
import gdbrunner

Expand Down Expand Up @@ -182,11 +182,7 @@ def extract_launchable(xmlroot):


def ndk_bin_path():
path = os.path.join(NDK_PATH, "host-tools", "bin")
if not os.path.exists(path):
error("Failed to find ndk binary path, should be at '{}'".format(path))

return path
return os.path.dirname(os.path.realpath(__file__))


def handle_args():
Expand Down

0 comments on commit a430a75

Please sign in to comment.