Skip to content

Commit 3b649ae

Browse files
committed
Allow -gpu angle. (Copy ANGLE from prebuilts)
If on Windows and ANGLE is in the prebuilts, copy them over. This allows -gpu angle. Together with the "optional GLESv1" CLs, this should work. CL that adds ANGLE prebuilts: https://android-review.googlesource.com/#/c/211945/ Change-Id: Ifc3af087f64c252fe6acbf585fd7271113c9ae59
1 parent fd69638 commit 3b649ae

File tree

1 file changed

+41
-1
lines changed

1 file changed

+41
-1
lines changed

android-configure.sh

+41-1
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,46 @@ case $HOST_OS in
682682
;;
683683
esac
684684

685+
###
686+
### Copy ANGLE if available
687+
###
688+
ANGLE_PREBUILTS_DIR=$AOSP_PREBUILTS_DIR/android-emulator-build/common/ANGLE
689+
if [ -d $ANGLE_PREBUILTS_DIR ]; then
690+
log "Copying ANGLE prebuilt libraries from $ANGLE_PREBUILTS_DIR"
691+
ANGLE_PREFIX=lib
692+
ANGLE_HOST=$HOST_OS
693+
case $ANGLE_HOST in
694+
windows)
695+
ANGLE_SUFFIX=.dll
696+
;;
697+
linux)
698+
ANGLE_SUFFIX=.so
699+
;;
700+
*)
701+
esac
702+
# Windows only (for now)
703+
if [ "$ANGLE_HOST" = "windows" ]; then
704+
for LIBNAME in EGL GLESv2; do # GLESv2 only for now
705+
for ANGLE_ARCH in $PREBUILT_ARCHS; do
706+
if [ "$ANGLE_ARCH" = "x86" ]; then
707+
ANGLE_LIBDIR=lib
708+
else
709+
ANGLE_LIBDIR=lib64
710+
fi
711+
ANGLE_LIBNAME=$ANGLE_PREFIX$LIBNAME$ANGLE_SUFFIX
712+
ANGLE_SRCDIR=$ANGLE_PREBUILTS_DIR/$ANGLE_HOST-$ANGLE_ARCH
713+
714+
ANGLE_DSTDIR="$OUT_DIR/$ANGLE_LIBDIR/gles_angle"
715+
ANGLE_DSTLIB="$ANGLE_LIBNAME"
716+
if [ -f "$ANGLE_SRCDIR/lib/$ANGLE_LIBNAME" ]; then
717+
install_prebuilt_dll "$ANGLE_SRCDIR/lib/$ANGLE_LIBNAME" \
718+
"$ANGLE_DSTDIR/$ANGLE_DSTLIB"
719+
fi
720+
done
721+
done
722+
fi
723+
fi
724+
685725
###
686726
### Copy Swiftshader if available
687727
###
@@ -710,7 +750,7 @@ if [ -d $SWIFTSHADER_PREBUILTS_DIR ]; then
710750
SWIFTSHADER_SRCDIR=$SWIFTSHADER_PREBUILTS_DIR/$SWIFTSHADER_HOST-$SWIFTSHADER_ARCH
711751

712752
SWIFTSHADER_DSTDIR="$OUT_DIR/$SWIFTSHADER_LIBDIR/gles_swiftshader"
713-
SWIFTSHADER_DSTLIB="$FINAL_LIBNAME"
753+
SWIFTSHADER_DSTLIB="$SWIFTSHADER_LIBNAME"
714754
if [ -f "$SWIFTSHADER_SRCDIR/lib/$SWIFTSHADER_LIBNAME" ]; then
715755
install_prebuilt_dll "$SWIFTSHADER_SRCDIR/lib/$SWIFTSHADER_LIBNAME" \
716756
"$SWIFTSHADER_DSTDIR/$SWIFTSHADER_DSTLIB"

0 commit comments

Comments
 (0)