diff options
| author | David 'Digit' Turner <digit@google.com> | 2015-04-01 11:06:27 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2015-04-01 11:06:27 +0200 |
| commit | 453f87243c96f9211ce726946a5b003c6e199a8a (patch) | |
| tree | 40b340503d22c8b0658f5ec16ca1b9ed85ff3ae2 /android-rebuild.sh | |
| parent | 33f7acc1514fa237b4c5436be585e29d837f7379 (diff) | |
| download | qemu-453f87243c96f9211ce726946a5b003c6e199a8a.tar.gz | |
android-rebuild.sh: Fix -gpu mesa.
The script contained a small bug that made it overwrite the Mesa library
with the OSMesa one. E.g. on Linux, objs/lib64/gles_mesa/libGL.so would
actually be a copy of libosmesa.so instead of the real Mesa libGL.so.
This prevented '-gpu mesa' from working since the lib64EGL_translator.so
library could not find GLX-related symbols.
Change-Id: I6b01d8b95c04bc9e1a2de26ac8e86ec73d949ca2
Diffstat (limited to 'android-rebuild.sh')
| -rwxr-xr-x | android-rebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android-rebuild.sh b/android-rebuild.sh index ecf9a981bd..93121e464a 100755 --- a/android-rebuild.sh +++ b/android-rebuild.sh @@ -206,7 +206,7 @@ if [ -d "$PREBUILTS_DIR/mesa" ]; then MESA_DSTDIR="$OUT_DIR/$MESA_LIBDIR/gles_mesa" echo "Copying $MESA_HOST-$MESA_ARCH $LIBNAME library to $MESA_DSTDIR" run mkdir -p "$MESA_DSTDIR" && - run cp -f "$MESA_LIBRARY" "$MESA_DSTDIR/$MESA_LIBNAME" + run cp -f "$MESA_LIBRARY" "$MESA_DSTDIR/$LIBNAME" if [ "$MESA_HOST" = "linux" -a "$LIBNAME" = "libGL.so" ]; then # Special handling for Linux, this is needed because SDL # will actually try to load libGL.so.1 before GPU emulation |