summaryrefslogtreecommitdiffstats
path: root/core/combo
Commit message (Collapse)AuthorAgeFilesLines
* Support to build executables against the NDKYing Wang2012-10-083-34/+34
| | | | | | | | Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you include $(BUILD_EXECUTABLE). Bug: 7170098 Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
* Fix common typo in comments, warning and error messages.Ian Rogers2012-10-011-1/+1
| | | | | | s/can not/cannot/g Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
* Move AndroidConfig.h from system/core to the build project.Ying Wang2012-09-2012-9/+2859
| | | | | | So unbundled branches don't need to include the system/core project. Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
* resolved conflicts for merge of 3e91f5ad to jb-mr1-devAndrew Hsieh2012-09-121-1/+2
|\ | | | | | | Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
| * Enable stack-protector for x86Andrew Hsieh2012-08-291-0/+1
| | | | | | | | Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
* | am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"Jean-Baptiste Queru2012-08-282-2/+2
|\ \ | |/ | | | | | | * commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e': Add pattern to check for GCC 4.6
| * Merge "Add pattern to check for GCC 4.6"Jean-Baptiste Queru2012-08-282-2/+2
| |\
| | * Add pattern to check for GCC 4.6Andrew Hsieh2012-08-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | GCC 4.6 --version can return 4.6.x-google but also simply 4.6 as of https://android-review.googlesource.com/#/c/42028. Add more pattern to detect it. Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
* | | resolved conflicts for merge of 5c903372 to jb-mr1-devJean-Baptiste Queru2012-08-281-3/+0
|\ \ \ | |/ / | | | | | | Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
| * | Merge "Use gold linker on x86"Jean-Baptiste Queru2012-08-281-3/+0
| |\ \ | | |/ | |/|
| | * Use gold linker on x86Pavel Chupin2012-08-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Patch removes fallback -fuse-ld=bfd for x86 target and --copy-dt-needed-entries which is not supported by gold linker. Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | | am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning ↵Jean-Baptiste Queru2012-08-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | where it belongs" * commit 'dbf6ad0692f98cacf27dc023854b2c5a5575a841': ARM: put crtbegin_so.o at the beginning where it belongs
| * | Merge "ARM: put crtbegin_so.o at the beginning where it belongs"Jean-Baptiste Queru2012-08-241-1/+1
| |\ \
| | * | ARM: put crtbegin_so.o at the beginning where it belongsArd Biesheuvel2012-08-211-1/+1
| | |/ | | | | | | | | | Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
* | | am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK ↵Jean-Baptiste Queru2012-08-221-6/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | versions" * commit 'e3479ea5033e2ede36f6f771dd3a6ea315505efd': Build on Mac OS X : add experimental SDK versions
| * | Merge "Build on Mac OS X : add experimental SDK versions"Jean-Baptiste Queru2012-08-221-6/+27
| |\ \
| | * | Build on Mac OS X : add experimental SDK versionsSangWook Han2012-08-221-6/+27
| | | | | | | | | | | | | | | | Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
| * | | Added BUILD_HOST_static to build statically linked executable/shared-libAndrew Hsieh2012-08-213-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: I615f574e918c83ed1ab82db2453b69d0420cb59c
* | | Merge "Don't include system/core/include/arch/<arch>/Android.mk for ↵Ying Wang2012-08-165-20/+25
|\ \ \ | | | | | | | | | | | | apps-only build." into jb-mr1-dev
| * | | Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.Ying Wang2012-08-165-20/+25
| | | | | | | | | | | | | | | | | | | | Bug: 6994483 Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
* | | | am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e': select.mk: Tune ccache options
| * | select.mk: Tune ccache optionsAndrew Boie2012-08-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these adjustments, cached object files can now be shared across multiple Android trees on a single workstation: * Compiler binary modification time no longer causes cache misses, as a hash of the compiler binary is taken rather than looking at the mtime and size * Header file modification time no longer causes cache misses, the headers are now always hashed * Macros such as __DATE__ and __TIME__ no longer cause cache misses * All paths in preprocessed source (due to use of -g) are now relative These options require ccache 3.1 or later to be used; ccache 2.4 will ignore these. Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | fix MIPS buildKeun young Park2012-08-151-5/+5
| | | | | | | | | | | | | | | | | | | | | - crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES, not under TARGET_OUT_STATIC_LIBRARIES Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
* | | resolved conflicts for merge of 0ac38a4e to jb-mr1-devElliott Hughes2012-08-111-185/+0
|\ \ \ | |/ / | | | | | | Change-Id: I0978f511f807797f89be4002bca654492231761c
| * | Remove TARGET_linux-sh.mk.Elliott Hughes2012-08-101-185/+0
| | | | | | | | | | | | | | | | | | SH support is long gone from bionic and dalvik. Change-Id: I613df5f0062d743686847610737af9a321eec1da
* | | Merge "arm: add --warn-shared-textrel" into jb-mr1-devNick Kralevich2012-08-101-0/+1
|\ \ \
| * | | arm: add --warn-shared-textrelNick Kralevich2012-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit a warning when the static linker detects a shared library has text relocations. Text relocations make it harder to share pages across processes, and make it harder to use certain memory protection features in, for example, SELinux. This warning will turn into an error in a future change (via --fatal-warnings) References: http://www.akkadia.org/drepper/textrelocs.html Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
* | | | am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '64b8c6e936ae713a61c53a85a0badbd7d480e414': Support for MIPS Build targets.
| * | Support for MIPS Build targets.Raghu Gandham2012-08-019-0/+402
| |/ | | | | | | | | | | Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Raghu Gandham <raghu@mips.com>
| * Add -fuse-ld=bfd to x86 targetAndrew Hsieh2012-07-251-0/+2
| | | | | | | | | | | | Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries". Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
* | Add -fuse-ld=bfd to x86 targetAndrew Hsieh2012-07-251-1/+2
| | | | | | | | | | | | Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries". Change-Id: I4e78967a076b3d093dd55366f7a54f0c9f9a45d1
* | am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from ↵Ying Wang2012-06-291-10/+0
|\ \ | |/ | | | | | | | | | | HOST_darwin-x86.mk to main.mk" * commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259': Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
| * am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to ↵Ying Wang2012-06-291-10/+0
| |\ | | | | | | | | | | | | | | | | | | main.mk" * commit 'e42ed0ba1571f20866609710ba7c73fd138c0405': Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
| | * Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mkYing Wang2012-06-281-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6754632 So the warning won't show up when you run lunch. Now the warning only shows when you do a clean build. Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
* | | am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aospJean-Baptiste Queru2012-06-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '6e207824af267eea8777949ccf6d0584accd55a0': x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
| * | resolved conflicts for merge of 572d0d7d to jb-dev-plus-aospJean-Baptiste Queru2012-06-131-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
| | * Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"Jean-Baptiste Queru2012-06-131-11/+7
| | |\
| | | * x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3Bruce Beare2012-05-251-11/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0576514621affefea86a14d419f428761a60e067 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | am 06b1a47f: am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires ↵Jean-Baptiste Queru2012-06-121-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | --copy-dt-needed-entries" * commit '06b1a47fe19699e8cb94fd6a007f82f3b41119fe': gcc 4.6 requires --copy-dt-needed-entries
| * | | am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"Jean-Baptiste Queru2012-06-121-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec': gcc 4.6 requires --copy-dt-needed-entries
| | * | Merge "gcc 4.6 requires --copy-dt-needed-entries"Jean-Baptiste Queru2012-06-121-0/+1
| | |\ \
| | | * | gcc 4.6 requires --copy-dt-needed-entriesBruce Beare2012-05-251-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Icc62106e0f2e96f4cd871bb4b3c46c7ca83cabec Author: Bruce Beare <bruce.j.beare@intel.com> Reviewed-by: Lu, Hongjiu <hongjiu.lu@intel.com>
* | | | resolved conflicts for merge of 5c0ee702 to masterYing Wang2012-06-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
| * | | am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"Ying Wang2012-06-081-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b': Fix generic build on Max OS X 10.7 Lion
| | * | Fix generic build on Max OS X 10.7 LionSangWook Han2012-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recover variable build_mac_version which is removed on commit 644dc16 and added on commit 9ce06f1. Without this, ranlib libSDL.a is executed on Lion which causes build fail of emulator-arm. Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
* | | | Tweak cflags for building with SDK 10.6.Ying Wang2012-06-071-2/+2
| | | | | | | | | | | | | | | | Change-Id: I4db9949577591ef6756812769f04cfaddd876faf
* | | | am f1e424a6: am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"Ying Wang2012-06-071-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe': XCode 4.3+ compatibility check-in
| * | | am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"Ying Wang2012-06-071-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba': XCode 4.3+ compatibility check-in
| | * | XCode 4.3+ compatibility check-inAl Sutton2012-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XCode 4.3 and later use a different location for SDKs. This check in ensures the build checks for the new location as well as the old one. Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241 Signed-off-by: Al Sutton <al@funkyandroid.com>
* | | | arm: add -D_FORTIFY_SOURCE=1 to the default cflagsNick Kralevich2012-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional compile and runtime buffer overflow detection to Android. As of today, Android supports additional buffer overflow detection for the following libc functions: * memcpy * memmove * strcpy * strcat * strncpy * strncat Support for additional functions will be added to bionic libc in future code changes. Please see * http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html * http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html for information on these features. Change-Id: I1a281a4bac20009f4730dd8d8b798fa107576230
generated by cgit v1.1 at 2025-03-14 14:19:05 +0000