summaryrefslogtreecommitdiffstats
path: root/core/combo
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."Ying Wang2012-06-051-10/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7': Use Mac OS X SDK 10.6.
| | * | Use Mac OS X SDK 10.6.Ying Wang2012-06-051-10/+6
| | |/ | | | | | | | | | Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
* | | Use Mac OS X SDK 10.6.Ying Wang2012-05-301-10/+6
| | | | | | | | | | | | Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
* | | Revert "Use Mac OS X SDK 10.6."Ying Wang2012-05-251-6/+10
| | | | | | | | | This reverts commit 4c1b310b9bdbebef83d298d305beb0122a7204f6
* | | Use Mac OS X SDK 10.6.Ying Wang2012-05-251-10/+6
| | | | | | | | | | | | Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
* | | Merge "Compile Mac OS binaries with unwind tables for libcorkscrew."Elliott Hughes2012-05-241-1/+1
|\ \ \
| * | | Compile Mac OS binaries with unwind tables for libcorkscrew.Elliott Hughes2012-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
* | | | am 6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to ↵Andrew Hsieh2012-05-211-5/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | x86" into jb-dev-plus-aosp * commit '6dfe3e11a56707ce288a4dec8d3022ff61ef023f': Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
| * | | Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into ↵Andrew Hsieh2012-05-211-5/+0
| |\ \ \ | | | | | | | | | | | | | | | jb-dev-plus-aosp
| | * | | Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86Andrew Hsieh2012-05-211-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason that atom-specific instruciton like "movbe" isn't "generic" to x86 Android devices and x86 host running emulator-x86, which may crash non-atom host in VT because "movbe" isn't supported natively. Also revert previous fix in TARGET_linux-x86.mk which conservatively disable "movbe" across the board Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
* | | | | am 99e1613f: am 72b329e5: am 3c5191c6: Merge "Update build rule for ↵Jean-Baptiste Queru2012-05-213-0/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" * commit '99e1613fd5d3773387b52910d7daa86535f42e25': Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
| * | | | am 72b329e5: am 3c5191c6: Merge "Update build rule for executable with ↵Jean-Baptiste Queru2012-05-213-0/+18
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" * commit '72b329e5042b8fc15cbcbea3d382a072f79eb961': Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
| | * | Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"Jean-Baptiste Queru2012-05-213-0/+18
| | |\ \
| | | * | Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIESKito Cheng2012-05-093-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ff53f51dcb57511a24765bdf6a61c000a7ce977 Signed-off-by: Kito Cheng <kito@0xlab.org>
* | | | | am 112a6747: Add -mno-movbe to disable "movbe" instruction from code-genAndrew Hsieh2012-05-211-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '112a674798c58052ddce94418e34f3e5a084ed1a': Add -mno-movbe to disable "movbe" instruction from code-gen
| * | | | Add -mno-movbe to disable "movbe" instruction from code-genAndrew Hsieh2012-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intruction "movbe" (move data after swapping bytes) is only available in Intel atom. Disable it for more general x86 devices and x86 hosts which run emulator-x86. Although emulator-x86 can support "movbe", most of the time we want to run emulator-x86 with VT support for speed (with KVM in Linux, or HAXM in Windows/MacOSX). The presence of "movbe" can crash emulator-x86 in VT because non-atom host doesn't have it natively. Change-Id: I86e037900ddcb8d544f92b8d8464c8627347e560
* | | | | am feec98b1: resolved conflicts for merge of 62855a83 to jb-dev-plus-aospJean-Baptiste Queru2012-05-171-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'feec98b139d2ca0b0164a5e178e75ce88b8f492f': Use i686-linux-android-4.6 for x86 build
| * | | | resolved conflicts for merge of 62855a83 to jb-dev-plus-aospJean-Baptiste Queru2012-05-161-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
| | * | | Merge "Use i686-linux-android-4.6 for x86 build"Jean-Baptiste Queru2012-05-161-1/+1
| | |\ \ \
| | | * | | Use i686-linux-android-4.6 for x86 buildH.J. Lu2012-05-141-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539 Author: "H.J. Lu" <hongjiu.lu@intel.com>
| | * | | stop using a custom linker script for static executables.Nick Kralevich2012-05-151-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | This is causing problems with making the linker relocatable. Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
* | | | Delete the misleading var TARGET_OUT_STATIC_LIBRARIES.Ying Wang2012-05-153-15/+15
| |_|/ |/| | | | | | | | | | | | | | Which can be replaced by TARGET_OUT_INTERMEDIATE_LIBRARIES. Change-Id: I965ff1ebe70fc3113c19e4896277c876dcedb6a5
* | | am 9d602a70: am ecb1a565: x86: compile everything with relro / bind_nowNick Kralevich2012-05-101-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '9d602a7005683965814823feda5aabcce5a92201': x86: compile everything with relro / bind_now
| * | am ecb1a565: x86: compile everything with relro / bind_nowNick Kralevich2012-05-101-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'ecb1a565849b40ab7aa45b7fe71e24e29a059376': x86: compile everything with relro / bind_now
| | * | x86: compile everything with relro / bind_nowNick Kralevich2012-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable relro / bind_now when compiling Android applications. This marks certain regions of memory as read-only after linking, making memory corruption security vulnerabilities are harder to exploit. See: * http://www.akkadia.org/drepper/nonselsec.pdf (section 6) * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html relro support has been enabled for ARM since 233d460f21d372f964f8078b8b0d5fd17af7c6b6. This change enables it for x86. Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
* | | | am 269a40d1: am b031afab: am bf3d3287: Merge "Use the same compilation flags ↵Jean-Baptiste Queru2012-05-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | on OS X 10.8 as 10.7" * commit '269a40d140753aee1e579f8179b132ffe3415150': Use the same compilation flags on OS X 10.8 as 10.7
| * | | am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 ↵Jean-Baptiste Queru2012-05-071-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | as 10.7" * commit 'b031afab543d8bf9bb236ff4c297f5ced70f8943': Use the same compilation flags on OS X 10.8 as 10.7
| | * | Use the same compilation flags on OS X 10.8 as 10.7Al Sutton2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Mountain Lion to the list of versions which don't need ranlib and don't need the pre-Lion linker flags Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5 Signed-off-by: Al Sutton <al@funkyandroid.com>
* | | | Merge "Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded."Shih-wei Liao2012-05-031-19/+1
|\ \ \ \
| * | | | Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded.Shih-wei Liao2012-05-031-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Mac build, force_load the LOCAL_WHOLE_STATIC_LIBRARIES. Mac has its custom linker. However, its linking rule for generating shared libraries doesn’t take the LOCAL_WHOLE_STATIC_LIBRARIES into consideration. Change-Id: Ia6858bf6e2ebb334db8f3d0bdc71d7ecc0ef11c1
* | | | | am 76cc34ca: am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use ↵Jean-Baptiste Queru2012-05-021-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | single slash version of -print-whatever" * commit '76cc34ca0adefac91f90fae478f2c6140e41e088': TARGET_linux-arm.mk: use single slash version of -print-whatever
| * | | | am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash ↵Jean-Baptiste Queru2012-05-021-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | version of -print-whatever" * commit '6dfbf0240b77acaf7d6b650b4c206deb29337e7b': TARGET_linux-arm.mk: use single slash version of -print-whatever
| | * | | Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"Jean-Baptiste Queru2012-05-021-1/+1
| | |\ \ \
| | | * | | TARGET_linux-arm.mk: use single slash version of -print-whateverJim Huang2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The double slash variants are not documented in GCC manual. Therefore, it is better to use the single slash variants as usual.
* | | | | | am 9bdc2907: am 8571ee47: am f562adc8: Merge "Force use of compatibility ↵Jean-Baptiste Queru2012-05-021-2/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compilers on Apple\'s command line tools" * commit '9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5': Force use of compatibility compilers on Apple's command line tools
| * | | | | am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on ↵Jean-Baptiste Queru2012-05-021-2/+12
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | | | | | | | | | | Apple\'s command line tools" * commit '8571ee478ee352827ec37460d23e6e0dbb1e96db': Force use of compatibility compilers on Apple's command line tools
| | * | | Force use of compatibility compilers on Apple's command line toolsAl Sutton2012-05-021-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cc and c++ compilers included in Apple's command line tools show some unusual behaviour which causes the build to fail in several projects under Xcode 4.3 This patch uses the gnu compatibility gcc and g++ compilers on OS X instead to reduce problems, and generates an error when an llvm based compiler is detected because they currently do not generate usable emulator executables due to them not honouring global register variables. Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262 Signed-off-by: Al Sutton <al@funkyandroid.com>
| | * | | Switch to new locations of toolchainsJean-Baptiste Queru2012-04-202-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
| | * | | Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.Jing Yu2012-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html -fstrict-volatile-bitfields is set on by default on gcc-4.6 for ARM target. This causes an inline asm() error. While upstream gcc community is working on the patch, we shut off this option temporarily. This patch does not affect gcc-4.4.3 build. Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
| | * | | Fix build problems with gcc-4.6.x.Doug Kwan2012-04-201-4/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
| | * | | Point to new linux prebuilt toolchain for SDK buildAndrew Hsieh2012-03-221-6/+6
| | |/ / | | | | | | | | | | | | Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
* | | | Added BUILD_HOST_static to build statically linked executable/shared-libAndrew Hsieh2012-04-283-0/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Statically linked executable/shared-lib (eg. SDK tools) are useful in sandboxed environment. In BUILD_HOST_static zipalign needs -lpthread indirectly: zipalign->libutils.a->liblog.a->logd_write.c->pthread Change-Id: I8fa91a937b728ccdf942c4ba199efb1e2e49da3d
* | | ARM: compile everything with relro / bind_now.Nick Kralevich2012-04-261-1/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable relro / bind_now when compiling Android applications. This marks certain regions of memory as read-only after linking, making memory corruption security vulnerabilities are harder to exploit. See: * http://www.akkadia.org/drepper/nonselsec.pdf (section 6) * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html Stop using the custom linker script, which inhibits relro / bind_now support. Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
* | On linux, always use the prebuilt host toolchainJean-Baptiste Queru2012-04-201-2/+0
| | | | | | | | Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
* | Revert "ARM: compile everything with relro / bind_now."Nick Kralevich2012-04-101-3/+1
| | | | | | | | This reverts commit 020e4919e89a824783dbe8716bc56785267323f7.
* | ARM: compile everything with relro / bind_now.Nick Kralevich2012-04-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable relro / bind_now when compiling Android applications. This marks certain regions of memory as read-only after linking, making memory corruption security vulnerabilities are harder to exploit. See: * http://www.akkadia.org/drepper/nonselsec.pdf (section 6) * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html Stop using the custom linker script, which inhibits relro / bind_now support. Change-Id: Iaebfbbb492299004f9da92b649985b6cd67d8c97
* | Switch default gcc toolchain from 4.4.3 to 4.6.Jing Yu2012-03-291-1/+1
| | | | | | | | | | | | Switch both arm-linux-androideabi toolchainand arm-eabi toolchain. Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
* | Point to new linux prebuilt toolchain for SDK buildAndrew Hsieh2012-03-131-6/+6
| | | | | | | | Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
* | BUILD_HOST_64bit=1 to build host tools in 64-bitAndrew Hsieh2012-02-283-7/+25
| | | | | | | | | | | | | | | | By default we build tool in 32-bit. This flag allow individual tool and its dependencies to be built in 64-bit (eg. Emulator). Fixes to resolve 64-bit porting issues (in other git) will be submitted seperately. Change-Id: I486cf7ddac727d3c374ed890857d497c3a69e598
* | Fix bug with the HOST_AR.Ying Wang2012-02-231-2/+2
| | | | | | | | Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76