diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
| commit | a546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch) | |
| tree | 01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /android-configure.sh | |
| parent | baf3d7830396202df5cc47bd7bcee109c319cdb3 (diff) | |
| parent | 0f809250987b64f491bd3b4b73c0f0d33036a786 (diff) | |
| download | external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'android-configure.sh')
| -rwxr-xr-x | android-configure.sh | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/android-configure.sh b/android-configure.sh index 5620e0e..38af78e 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -22,7 +22,6 @@ OPTION_IGNORE_AUDIO=no OPTION_NO_PREBUILTS=no OPTION_TRY_64=no OPTION_HELP=no -OPTION_DEBUG=no OPTION_STATIC=no OPTION_MINGW=no @@ -60,8 +59,6 @@ for opt do ;; --no-strip) OPTION_NO_STRIP=yes ;; - --debug) OPTION_DEBUG=yes - ;; --ignore-audio) OPTION_IGNORE_AUDIO=yes ;; --no-prebuilts) OPTION_NO_PREBUILTS=yes @@ -196,15 +193,9 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then # use ccache if USE_CCACHE is defined and the corresponding # binary is available. # - # note: located in PREBUILT/ccache/ccache in the new tree layout - # located in PREBUILT/ccache in the old one - # if [ -n "$USE_CCACHE" ] ; then CCACHE="$ANDROID_PREBUILT/ccache/ccache$EXE" if [ ! -f $CCACHE ] ; then - CCACHE="$ANDROID_PREBUILT/ccache$EXE" - fi - if [ ! -f $CCACHE ] ; then CCACHE="$ANDROID_PREBUILTS/ccache/ccache$EXE" fi if [ -f $CCACHE ] ; then @@ -240,7 +231,7 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then GLES_SUPPORT=yes if [ -z "$GLES_INCLUDE" ]; then log "GLES : Probing for headers" - GLES_INCLUDE=$ANDROID_TOP/development/tools/emulator/opengl/host/include + GLES_INCLUDE=$ANDROID_TOP/sdk/emulator/opengl/host/include if [ -d "$GLES_INCLUDE" ]; then log "GLES : Headers in $GLES_INCLUDE" else @@ -261,6 +252,32 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then fi fi fi +else + if [ "$GLES_PROBE" = "yes" ]; then + GLES_SUPPORT=yes + if [ -z "$GLES_INCLUDE" ]; then + log "GLES : Probing for headers" + GLES_INCLUDE=../../sdk/emulator/opengl/host/include + if [ -d "$GLES_INCLUDE" ]; then + log "GLES : Headers in $GLES_INCLUDE" + else + echo "Warning: Could not find OpenGLES emulation include dir: $GLES_INCLUDE" + echo "Disabling GLES emulation from this build!" + GLES_SUPPORT=no + fi + fi + if [ -z "$GLES_LIBS" ]; then + log "GLES : Probing for host libraries" + GLES_LIBS=../../out/host/$OS/lib + if [ -d "$GLES_LIBS" ]; then + echo "GLES : Libs in $GLES_LIBS" + else + echo "Warning: Could nof find OpenGLES emulation libraries in: $GLES_LIBS" + echo "Disabling GLES emulation from this build!" + GLES_SUPPORT=no + fi + fi + fi fi # IN_ANDROID_BUILD = no if [ "$GLES_SUPPORT" = "yes" ]; then @@ -521,6 +538,10 @@ if [ $TARGET_ARCH = x86 ] ; then echo "TARGET_ARCH := x86" >> $config_mk fi +if [ $TARGET_ARCH = mips ] ; then +echo "TARGET_ARCH := mips" >> $config_mk +fi + echo "HOST_PREBUILT_TAG := $TARGET_OS" >> $config_mk echo "HOST_EXEEXT := $TARGET_EXEEXT" >> $config_mk echo "PREBUILT := $ANDROID_PREBUILT" >> $config_mk |