aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-15 01:22:16 -0700
committerAndroid Code Review <code-review@android.com>2011-05-15 01:22:16 -0700
commitaad051542cae51b2eee5a179f32e648eaae1f339 (patch)
treee9caf3bec9f8e286877316e50b17af74813532c6
parentbfe866d6a49a98afaf647ef912ceda47e9ec92f7 (diff)
parentf0cee2e578098010b6957c8cbfc2324df42fb0d9 (diff)
downloadexternal_qemu-aad051542cae51b2eee5a179f32e648eaae1f339.zip
external_qemu-aad051542cae51b2eee5a179f32e648eaae1f339.tar.gz
external_qemu-aad051542cae51b2eee5a179f32e648eaae1f339.tar.bz2
Merge "Fix the pc-bios search path for build trees."
-rw-r--r--vl-android.c4
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)
{