summaryrefslogtreecommitdiffstats
path: root/core/combo
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Fix for duplicate names in whole static libs""Dan Albert2014-05-271-1/+1
|\
| * Revert "Fix for duplicate names in whole static libs"Dan Albert2014-05-271-1/+1
| | | | | | | | | | | | This reverts commit 0e5ce8be34446278a3404ea2a4afc01f20f86c5a. Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
* | Merge "Fix for duplicate names in whole static libs"Dan Albert2014-05-271-1/+1
|\ \ | |/
| * Fix for duplicate names in whole static libsDan Albert2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | _extract-and-include-single-(host|target)-whole-static-lib was written such that only the first file of a given name would be extracted and included into the new library. This patch iterates over each identically named archive member, extracts them individually, and adds them to the new archive. Bug: 15110069 Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
* | Exclude libstdc++ and libgcc if libc++ is requested.Ying Wang2014-05-236-26/+26
|/ | | | | Bug: 15174002 Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
* Use aarch64-linux-android-4.9 for arm64 build (attempt #4)Ben Cheng2014-05-191-6/+5
| | | | | | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Source code has been sync'ed against the 2014-05-14 snapshot which contains many important fixes (devirtualization, codegen, ...). Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
* Fix the missing 2nd arch prefix.Ying Wang2014-05-161-1/+1
| | | | | Bug: 13751317 Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
* Support host multilib buildYing Wang2014-05-148-146/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change basically ported our target multilib to the host side. It supports 2 host build modes: x86 and x86_64 multilib build. For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64 multilib build. Later we'll default to x86_64 build and have a flag to force 32-bit only build, which may be needed by SDK build. In host module definition, like in target ones, you can use the following LOCAL variables to set up multilib configuration: LOCAL_MULTILIB: can be "both", "first", "32" or "64". It also supports the same set of arch or 32-vs-64 specific LOCAL variables. By default, it builds only for the first arch. To keep path compatibility, in x86_64 build files are still output to out/host/linux-x86; Both 32-bit and 64-bit executables are in out/host/linux-86/bin; In x86_64 build 32-bit shared libraries are installed to out/host/linux-x86/lib32 and 64-bit shared libraries are installed to out/host/linux-x86/lib; 32-bit object files are output to out/host/linux-x86/obj32 and 64-bit object files are output to out/host/linux-x86/obj. Bug: 13751317 Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
* Merge "Define __USE_MINGW_ANSI_STDIO for windows build"Andrew Hsieh2014-05-131-1/+1
|\
| * Define __USE_MINGW_ANSI_STDIO for windows buildAndrew Hsieh2014-05-091-1/+1
| | | | | | | | | | | | | | | | Some printf/scanf functions in Windows aren't C99 compatible. Define __USE_MINGW_ANSI_STDIO for mingw compiler to use it's own set of replacement libraries which are more C99-like. Change-Id: I51dfa582971ec0487409067e8bb7fe3a44577b93
* | Merge "Disable canonical prefixes of system headers"Andrew Hsieh2014-05-097-2/+15
|\ \
| * | Disable canonical prefixes of system headersAndrew Hsieh2014-05-097-2/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC know a few pre-defined paths (relative to its location) to search for headers, libraries, program, etc. By default GCC prefixes its own path(argv[0]) and calls realpath() which result in absolute path with all symlink, . and .. removed. It's usually good to have canonicalised paths, but absolute paths in *.d file can cause unnecessary relinking when stale entries in ccache cache hit Add -no-canonical-prefixes (gcc>=4.6) and -fno-canonical-system-headers (gcc>4.6) to disable realpath() on prefixed paths Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
* | javac: rename common_flags to avoid conflictionsNick Reuter2014-05-081-4/+4
|/ | | | | | | | * Currently the flag conflicts with one seen in hardware/qcom rename to avoid issues. Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8 Signed-off-by: Nick Reuter <nreuter85@gmail.com>
* Apply LOCAL_LDLIBS to target build rules too.Ying Wang2014-05-076-12/+24
| | | | | | | | | Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK libraries). Previously LOCAL_LDLIBS only applies to host modules and the behaviour confuses users. Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
* add silvermont x86 architectureAndrew Boie2014-04-302-0/+37
| | | | | | | | | This is used for Baytrail targets. Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c Signed-off-by: Andrew Boie <andrew.p.boie@intel.com> Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com> Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
* Merge "Leave 'linux' defined on x86/x86-64, like arm."Elliott Hughes2014-04-242-2/+0
|\
| * Leave 'linux' defined on x86/x86-64, like arm.Elliott Hughes2014-04-232-2/+0
| | | | | | | | Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
* | Leave 'linux' defined on mips/mips64, like arm.Elliott Hughes2014-04-232-2/+2
|/ | | | Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
* Switch to new host prebuilt x86_64-linux-glibc2.11-4.6Andrew Hsieh2014-04-231-7/+2
| | | | Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
* Update build system for better Clang behavior on Mac.Tim Murray2014-04-221-3/+7
| | | | Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
* Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"Ben Cheng2014-04-181-5/+6
| | | | | | | | This reverts commit 084a7f83875d030c2e4819bed386c4a16168e731. GCC 4.9 still has stability issues (b/14160872) Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
* Use aarch64-linux-android-4.9 for arm64 build (attempt #3)Ben Cheng2014-04-161-6/+5
| | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
* Add -Wl,-maarch64linuxAndrew Hsieh2014-04-151-0/+1
| | | | | | | | | | | The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/ The existing ld.bfd is fine because it's configured to support aarch64linux only. ld.mcld (see https://android-review.googlesource.com/#/c/91047) needs explicit emulation switch because it supports multiple targets Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
* Merge ""desktop" linux has Posix clocks."Narayan Kamath2014-04-151-4/+1
|\
| * "desktop" linux has Posix clocks.Narayan Kamath2014-04-101-4/+1
| | | | | | | | Change-Id: I90885a2bbb65f14f774ae72b2ca6738176bf0341
* | Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"Ben Cheng2014-04-111-5/+6
| | | | | | | | | | | | | | This reverts commit 1ae9b213eb5648205223e4b825f4c808a5d2ace8. Sigh... new warnings found by 4.9 break checkbuild. Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
* | Use aarch64-linux-android-4.9 for arm64 build (attempt #2)Ben Cheng2014-04-111-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk/*/4.8/* GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
* | Decouple platform compiler and NDK library versioning.Ben Cheng2014-04-106-0/+18
| | | | | | | | | | | | | | TARGET_GCC_VERSION: select compiler from prebuilts/gcc/... TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/... Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
* | Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""Ben Cheng2014-04-101-5/+6
|\ \
| * | Revert "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-5/+6
| | | | | | | | | | | | | | | | | | This reverts commit 6154690d8615995b961530479ddc1a34946efe49. Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
* | | Merge "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-6/+5
|\ \ \ | |/ / | | / | |/ |/|
| * Use aarch64-linux-android-4.9 for arm64 build.Ben Cheng2014-04-091-6/+5
| | | | | | | | | | | | | | Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1 GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7
* | Increase the maximum javac heap size again.Ying Wang2014-04-091-1/+1
|/ | | | Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
* Stop defining HAVE_TIMEDWAIT_MONOTONIC.Narayan Kamath2014-04-099-54/+0
| | | | | | | We no longer provide this function in bionic. All callers should be moved over to pthread_condattr_setclock(). Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
* Build with java7 by default.Narayan Kamath2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | All introduce a flag LEGACY_USE_JAVA6 to force java6 builds. This is an unsupported configuration, and provided temporarily to iron out regressions and compare build output (if required.). - Increment the version check sequence number. - Move a more specific check (OpenJDK vs non OpenJDK) after the more general version check. - Update the link in the version check error message to the "initializing" page instead of the "download" page. The latter talks about repo, mainly. bug: 8992787 Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d Conflicts: core/main.mk
* Merge "Specify -mcpu=cortex-a15 for denver CPU variants."Christopher Ferris2014-03-311-1/+1
|\
| * Specify -mcpu=cortex-a15 for denver CPU variants.Shu Zhang2014-03-241-1/+1
| | | | | | | | Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
* | Remove the unnecessary indirection of TARGET_STRIP_COMMANDYing Wang2014-03-286-6/+0
| | | | | | | | | | | | | | Now all archs use the same strip command which can be put just in transform-to-stripped. Change-Id: Ief79697d47ea142fc9e63e63a7e2dace9e839165
* | Increase the maximum javac heap size.Ying Wang2014-03-261-1/+1
| | | | | | | | | | | | Java 7 needs more memory when you run some annotation tools. Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
* | Make Clang host builds hermetic on Linux.Tim Murray2014-03-242-0/+8
|/ | | | | | | | | This lays the groundwork for making builds hermetic on Darwin as well. That will be fixed in a future patch. bug 13435344 Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
* Add a method to leave the symbol table in a library.Christopher Ferris2014-03-186-38/+12
| | | | | | | | | | | | When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules will be modified so that only the .debug_* sections are removed. The original symbol table is left alone. This allows the compilation of certain libraries so that libbacktrace library can provide meaningful names to functions. Bug: 12958251 Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
* Remove arm64 clang build warningYing Wang2014-03-181-3/+0
| | | | | | | | Now we have enabled arm64 clang. This change remvoed arm64 clang build warning and cleaned the arm64 unknow c flags. Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
* Merge "Work in progress to enable build system support for Clang."Colin Cross2014-03-151-1/+1
|\
| * Work in progress to enable build system support for Clang.Tim Murray2014-03-141-1/+1
| | | | | | | | Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
* | Fix HOST_TOOLCHAIN_PREFIXAndrew Hsieh2014-03-121-6/+6
|/ | | | | | | | | Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc format. Fix it so we can try out new host toolchain, eg. HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
* Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANGYing Wang2014-03-102-2/+2
| | | | | | | Still keep WITHOUT_CLANG, which enables both. Bug: 13402154 Change-Id: I32cb668223997719875751bf3d64f592d6086830
* Define __STDC_CONSTANT_MACROS globally to work around host build differences.Ian Rogers2014-03-103-3/+3
| | | | Change-Id: I945128b3087b28f62467c7123b759e3514027574
* Revert "Define __STDC_LIMIT_MACROS globally to work around host build ↵Ian Rogers2014-03-103-3/+3
| | | | | | | | differences." This reverts commit 668427c941bd88cacdf24d0562e6b68eb93038a1. Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
* Define __STDC_LIMIT_MACROS globally to work around host build differences.Ian Rogers2014-03-103-3/+3
| | | | Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
* Make -rpath-link work with multilib.Ying Wang2014-02-216-6/+6
| | | | Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783