diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-13 02:13:40 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-13 19:37:07 -0700 |
commit | c7389bd69e570a2c8432b37399aff1976b021f0f (patch) | |
tree | 26a2d56f6b9af09f83276358de1bfaf4ef8f91d7 /android/build | |
parent | d4f5a3ae87a7246613188940c1667bf2880da402 (diff) | |
download | external_qemu-c7389bd69e570a2c8432b37399aff1976b021f0f.zip external_qemu-c7389bd69e570a2c8432b37399aff1976b021f0f.tar.gz external_qemu-c7389bd69e570a2c8432b37399aff1976b021f0f.tar.bz2 |
64-bit emulator
Patch to allow emulator searches for emulator64-${ARCH} first on
64-bit OS. If none is found, the original behavior which searchs
for 32-bit emulator-${ARCH} is performed as usual.
64-bit emulator (which still emulates Android built in 32-bit) offers
up to 20% speedup compared to its 32-bit counterpart.
Details:
android/main-emulator.c
1) search emulator64 based on the OS
2) dlopen lib64OpenglRender in 64-bit
Makefile.*
1) Rules to build 64-bit executable emulator64-{x86,arm} and libraries
emulator64-{libui,libqemu,target-i386,target-arm,libelff,common}
2) remove -Wa,-32
3) Changes prebuit toolchain path
android-configure.h
android/build/common.h
1) no longer force 32-bit build (because now prebuilts/tools/gcc-sdk/gcc
can now handle 64-bit
2) set ANDROID_PREBUILTS to correctly locate ccache
android/config/*/config-host.h
1) Detect HOST_X86_64 and HOST_X86_64/HOST_I386
Misc 64-bit porting clean-up
1) use %zx to print variable of type size_t in hex
2) use %zu to print variable of type size_t in dec
3) Initialize query_parm to NULL
4) use PRIu64 to replace PDUd64
5) use PRId64/PRIu64/PRIX64 to print 64-bit
6) drop PRUx64 because PRIx64 does the same
7) cast pointer arith to intptr_t before casting to int
8) fixed 1ULL<<63
Change-Id: Ife62a20063a6ec38d4a9b23977e840af1fce149a
Diffstat (limited to 'android/build')
-rw-r--r-- | android/build/common.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/android/build/common.sh b/android/build/common.sh index de4e3c1..c7235ae 100644 --- a/android/build/common.sh +++ b/android/build/common.sh @@ -493,21 +493,20 @@ get_android_abs_build_var () # Locate the Android prebuilt directory for your os # you should only call this if IN_ANDROID_BUILD is "yes" # -# This will set ANDROID_PREBUILT_HOST_TAG and ANDROID_PREBUILT +# This will set ANDROID_PREBUILT_HOST_TAG, ANDROID_PREBUILT and ANDROID_PREBUILTS # locate_android_prebuilt () { # locate prebuilt directory ANDROID_PREBUILT_HOST_TAG=$OS ANDROID_PREBUILT=$ANDROID_TOP/prebuilt/$ANDROID_PREBUILT_HOST_TAG + ANDROID_PREBUILTS=$ANDROID_TOP/prebuilts/misc/$ANDROID_PREBUILT_HOST_TAG if [ ! -d $ANDROID_PREBUILT ] ; then # this can happen when building on x86_64 case $OS in linux-x86_64) ANDROID_PREBUILT_HOST_TAG=linux-x86 ANDROID_PREBUILT=$ANDROID_TOP/prebuilt/$ANDROID_PREBUILT_HOST_TAG - log "Forcing usage of 32-bit prebuilts" - force_32bit_binaries ;; *) esac @@ -516,7 +515,22 @@ locate_android_prebuilt () exit 1 fi fi + if [ ! -d $ANDROID_PREBUILTS ] ; then + # this can happen when building on x86_64 + case $OS in + linux-x86_64) + ANDROID_PREBUILT_HOST_TAG=linux-x86 + ANDROID_PREBUILTS=$ANDROID_TOP/prebuilts/misc/$ANDROID_PREBUILT_HOST_TAG + ;; + *) + esac + if [ ! -d $ANDROID_PREBUILTS ] ; then + echo "Can't find the prebuilts directory $ANDROID_PREBUILTS in Android build" + exit 1 + fi + fi log "Prebuilt : ANDROID_PREBUILT=$ANDROID_PREBUILT" + log "Prebuilts : ANDROID_PREBUILTS=$ANDROID_PREBUILTS" } ## Build configuration file support @@ -561,6 +575,7 @@ add_android_config_mk () fi echo "HOST_PREBUILT_TAG := $HOST_TAG" >> $config_mk echo "PREBUILT := $ANDROID_PREBUILT" >> $config_mk + echo "PREBUILTS := $ANDROID_PREBUILTS" >> $config_mk } # Find pattern $1 in string $2 |