diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-14 10:08:51 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-05-14 10:08:51 +0200 |
| commit | f0cee2e578098010b6957c8cbfc2324df42fb0d9 (patch) | |
| tree | e9caf3bec9f8e286877316e50b17af74813532c6 | |
| parent | bfe866d6a49a98afaf647ef912ceda47e9ec92f7 (diff) | |
| download | external_qemu-f0cee2e578098010b6957c8cbfc2324df42fb0d9.zip external_qemu-f0cee2e578098010b6957c8cbfc2324df42fb0d9.tar.gz external_qemu-f0cee2e578098010b6957c8cbfc2324df42fb0d9.tar.bz2 | |
Fix the pc-bios search path for build trees.
This patch fixes the routine that looks for the x86 BIOS
file(s) when running from the build tree (i.e. typing
'emulator' just after building the full_x86-eng product).
Turns out that the files are installed under
out/host/<system>/usr/share/pc-bios by our build scripts.
Change-Id: I51ae849d5cdf130558d05f2386c4175dfea1e054
| -rw-r--r-- | vl-android.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vl-android.c b/vl-android.c index 2e1f0f9..acde409 100644 --- a/vl-android.c +++ b/vl-android.c @@ -3549,10 +3549,10 @@ static char *find_datadir(const char *argv0) /* Find a likely location for support files using the location of the binary. For installed binaries this will be "$bindir/../share/qemu". When - running from the build tree this will be "$bindir/../pc-bios". + running from the build tree this will be "$bindir/../usr/share/pc-bios". The emulator running from the SDK will find the support files in $bindir/lib/pc-bios. */ #define SHARE_SUFFIX "/share/qemu" -#define BUILD_SUFFIX "/pc-bios" +#define BUILD_SUFFIX "/usr/share/pc-bios" #define SDK_SUFFIX "/lib/pc-bios" static char *find_datadir(const char *argv0) { |