summaryrefslogtreecommitdiffstats
path: root/core/combo
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Strip all symbols on x86"Ying Wang2014-02-203-5/+5
|\
| * Strip all symbols on x86C. Sean Young2014-02-193-5/+5
| | | | | | | | | | | | | | Strip all of the non-dynamic symbols on x86 targets, instead of just the debug symbols. Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
* | Add missing $(combo_2nd_arch_prefix)s to mips.Elliott Hughes2014-02-191-55/+55
|/ | | | Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
* Merge "Fix x86 config file to support 2nd ARCH build"Ying Wang2014-02-191-59/+59
|\
| * Fix x86 config file to support 2nd ARCH buildQiming Shi2014-02-171-59/+59
| | | | | | | | | | Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
* | Merge "Switch x86_64 to gcc-4.8"Ying Wang2014-02-191-1/+1
|\ \
| * | Switch x86_64 to gcc-4.8Pavel Chupin2014-02-181-1/+1
| |/ | | | | | | | | | | | | x86 is already on gcc-4.8 Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | x86: set -msse2 for all buildsColin Cross2014-02-181-0/+1
|/ | | | | | All supported x86 processors have SSE2. Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
* Fix incorrect x86 build rules.Stephen Hines2014-02-132-2/+0
| | | | | | | | combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their linker command lines. This results in clang builds not working properly, since they strip some unknown flags from TARGET_GLOBAL_CFLAGS. Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
* Merge "Refreshed gcc predefines __ANDROID__"Ben Cheng2014-02-071-3/+0
|\
| * Refreshed gcc predefines __ANDROID__Ben Cheng2014-02-071-3/+0
| | | | | | | | Change-Id: Id76f5a7490fba8190329e5ce3c4b138976a034ce
* | Select the arch_variant_cflags for the 2nd arch.Ying Wang2014-02-071-3/+3
|/ | | | Change-Id: Id2f9d7073a4aae3ba0fe5e5464045761f4d42b4e
* Merge "Turn 64-bit-related warnings into errors on 64-bit builds."Elliott Hughes2014-02-062-2/+14
|\
| * Turn 64-bit-related warnings into errors on 64-bit builds.Elliott Hughes2014-02-052-2/+14
| | | | | | | | | | | | | | | | | | I don't think we can realistically turn this on for 32-bit builds any time soon. Also, fix the arm64 stack-protector hack. Change-Id: Ie1e7c875bbc06fb21bb372b8ca99879a23ef53d4
* | [MIPS64] Add mips64 targetChris Dearman2014-02-053-0/+675
| | | | | | | | | | Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf Signed-off-by: Duane Sand <duane.sand@imgtec.com>
* | remove 2nd arch from ARCH_ARM_* definesColin Cross2014-02-042-6/+6
|/ | | | | | | Users of ARCH_ARM_* defines don't care about first vs. second arch, set ARCH_ARM_* regardless of which arch is arm. Change-Id: I2ae83ec5c3f839ff91a0e352c95d76ec2cbd5dc5
* Define __STDC_FORMAT_MACROS on Windows host builds.Ian Rogers2014-01-291-0/+4
| | | | Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
* Fix the host inttypes.h problem globally.Ian Rogers2014-01-292-0/+8
| | | | | Bug: 12708004 Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
* Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."Elliott Hughes2014-01-282-2/+2
|\
| * Fix KERNEL_HEADERS_ARCH for mips and x86.Elliott Hughes2014-01-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64 use headers that work for both widths. So where arm/arm64 need to handle the second architecture case specially, all we need to do for the others is hard-code the name. (x86_64.mk already hard-codes x86; we need to change x86.mk for the case where we're building the 32-bit binaries for a mixed system. mips64.mk doesn't exist yet, but when it does, it'll hard-code just plain "mips" too.) Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
* | Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGSColin Cross2014-01-271-0/+3
|/ | | | | | | | | | | To ease the transition between toolchains, allow a target to specify a list of cflags that the toolchain does not support. These will be filtered out of the cflags provided by the module. Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the aarch64 toolchain, it does not yet suport -fstack-protector. Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
* Remove libthread_db from the default include path.Elliott Hughes2014-01-275-10/+0
| | | | | | | | | | This should never have been on the default include path. The NDK statically links its own libthread_db, so I'm removing bionic's unused copy from devices. Bug: 11882807 Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
* build: use arm kernel headers for arm 2nd arch buildsColin Cross2014-01-241-1/+1
| | | | | | | | Compiling for arm requires using the arm kernel headers and not the aarch64 kernel headers. Add $(combo_2nd_arch_prefix) to get asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch. Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
* Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-241-0/+1
| | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of shared_library_internal.mk. Intermediate fils of libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/ and the built libfoo.so will be in $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib. Bug: 11654773 Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
* Set up rules to build static libraries for TARGET_2ND_ARCHYing Wang2014-01-241-1/+1
| | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of static_library_internal.mk. libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a. Bug: 11654773 Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
* Load compiler environment for a second arch.Ying Wang2014-01-248-104/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step to build 32-bit libraries in a 64-bit product. It will work like this: 1) In the product's BoardConfig.mk, define: TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT. The build system uses those variables to set up an additional compiler environment for the second arch. 2) When parsing Android.mks, the build system sets up rules to build a module for both the 1st arch and the 2nd arch, unless it's explicitly asked to skip so. Android.mk will be adapted if there is additional rule of generating source files. The build system will accept arch-specific LOCAL_ variables, such as LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15, LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for various archs at the same time. 3) Install binary of the 2nd arch by adding "<module_name>:32" to PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32" will be installed automatically. Bug: 11654773 Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30 Conflicts: core/combo/TARGET_linux-arm.mk
* build: rename aarch64 target to arm64Colin Cross2014-01-233-3/+3
| | | | | | | Rename aarch64 build targets to arm64. The gcc toolchain is still aarch64. Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
* [MIPS] Reenable linker fatal-warningsChris Dearman2014-01-151-0/+1
| | | Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
* Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."Elliott Hughes2014-01-115-55/+10
|\
| * Remove obsolete CUSTOM_KERNEL_HEADERS.Elliott Hughes2014-01-105-55/+10
| | | | | | | | Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
* | Add support for ALTERNATE_JAVACBrian Carlstrom2014-01-091-2/+9
|/ | | | | Bug: 12476356 Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
* Remove a non-existent directory from the include path.Elliott Hughes2013-12-201-3/+1
| | | | | | Brings aarch64 in line with the other architectures. Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
* Fix aarch64 and x86-64 AndroidConfig.h.Elliott Hughes2013-12-182-5/+5
| | | | | | | _LARGEFILE_SOURCE should never be defined with bionic. _FILE_OFFSET_BITS should be 64 on 64-bit architectures. Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
* Merge "Re-enable uapi kernel headers for arm."Christopher Ferris2013-12-171-4/+3
|\
| * Re-enable uapi kernel headers for arm.Christopher Ferris2013-12-161-4/+3
| | | | | | | | | | Bug: 11559337 Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
* | Make aarch64 more like arm wrt strict-aliasing.Elliott Hughes2013-12-161-0/+3
| | | | | | | | | | | | | | All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64 porting any more difficult than it needs to be. Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
* | Revert "Enable uapi kernel headers for arm."Christopher Ferris2013-12-161-3/+4
| | | | | | | | | | | | This reverts commit 88c6c533e17f7bc2e1491310b8d679a91b33aaeb. Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
* | Enable uapi kernel headers for arm.Christopher Ferris2013-12-161-4/+3
|/ | | | | Bug: 11559337 Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
* Merge "Enable NX protections"Ying Wang2013-12-131-4/+4
|\
| * Enable NX protectionsJoshua J. Drake2013-12-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | Add -Wa,--noexecstack and -Wl,-z,noexecstack as default flags when compiling host-side applications. This enables NX protections, which prevent code from executing on the stack or heap. NX protections make exploiting memory corruption issues more challenging and is an important security feature. Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
* | Add an explicit definition of __ANDROID__=1Ben Cheng2013-12-121-6/+3
|/ | | | | | | Once the aarch64 toolchain is refreshed this will be removed. Also removed some CFLAG duplications. Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
* Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"Ying Wang2013-12-112-0/+4
|\
| * Added TARGET_IS_64_BIT flag for x86_64 and aarch64Alexey Volkov2013-12-112-0/+4
| | | | | | | | | | Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
* | A few more Java7 related clean ups.Narayan Kamath2013-12-051-2/+2
|/ | | | | | | | | | | | | - Separate SDK checking from version checking and make messages clearer. - Add explicit source & target versions for javac to make things clearer. - Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to EXPERIMENTAL_USE_JAVA7. - Allow Oracle JDK 1.7 to be used on Mac OS, since there's no official OpenJDK support for that platform. Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
* Run ar in Deterministic mode.Ying Wang2013-12-021-1/+1
| | | | | | | Unfortunately no such flag was found for the host ar on Mac OS X. https://code.google.com/p/android/issues/detail?id=60705 Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
* Merge "Switch x86 over to uapi-only."Elliott Hughes2013-11-261-2/+1
|\
| * Switch x86 over to uapi-only.Elliott Hughes2013-11-251-2/+1
| | | | | | | | | | Bug: 11559337 Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
* | Add experimental flag to support OpenJDK builds.Ying Wang2013-11-261-10/+10
| | | | | | | | | | | | | | | | bug: 8992787 (cherry picked from commit d1dbe7f5a23bacdff086b4992e1d31a96da706c3) Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
* | Switch MIPS over to uapi-only.Elliott Hughes2013-11-251-2/+1
|/ | | | | Bug: 11559337 Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
* Add a "reverse AUX hack" for ARM.Elliott Hughes2013-11-251-1/+2
| | | | | | | | | | MIPS and x86 are almost completely switched over to uapi-only. ARM is still currently old-only. A cleanup of the uapi headers over the weekend means that the uapi-only <linux/kexec.h> is now in the right place, which will break the ARM build unless the ARM build also looks in the uapi headers if it can't find an old header. Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461