summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro ↵Jim Huang2011-11-101-1/+1
|\ | | | | | | | | | | | | _FORTIFY_SOURCE * commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6': HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
| * am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCEJim Huang2011-11-101-1/+1
| |\ | | | | | | | | | | | | * commit 'cb48497ff2f84e8f7def981246ddc028ea126879': HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
| | * HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCEJim Huang2011-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While building Android with latest host gcc, it causes the following build error: Install: out/host/linux-x86/bin/mkbootimg host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] <built-in>:0:0: note: this is the location of the previous definition cc1plus: all warnings being treated as errors In order to make build system happy, this patch does unset macro _FORTIFY_SOURCE and then define it in host cflags. Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
| * | am e915ab45: Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| |\ \ | | |/ | | | | | | | | | * commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593': Place linker arguments after objects for gcc
| | * Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| | | | | | | | | | | | | | | | | | | | | gcc 4.6.1 does not properly link if libraries are specified before objects. Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
* | | Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| | | | | | | | | | | | | | | | | | | | | gcc 4.6.1 does not properly link if libraries are specified before objects. Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
* | | x86: enable PIE for dynamically linked executablesNick Kralevich2011-11-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile all x86 programs on Android with -fPIE and -pie. This enables PIE (Position Independent Executables), which helps protect Android applications from exploitation due to memory management bugs. Note 1: PIE *static* executables are not supported at this time and require additional linker changes. Note 2: This change compliments 026a85b129e4540a4d8d40aace47aa0c69f609da, which was the exact same change, except for ARM. Testing: Rebuilt the tree completely from scratch, and verified that the system boots and basic functionality works in the emulator. Change-Id: I990064c37da3d857e663b27f31fee05f689a2824
* | | am 976fbcbd: am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
|\ \ \ | |/ / | | | | | | | | | * commit '976fbcbd095ced5b07e7b0ed777f013c7b8ca717': Stop Packaging Old CTS Test Runner Files
| * | am 277be2fe: Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
| |\ \ | | |/ | | | | | | | | | * commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb': Stop Packaging Old CTS Test Runner Files
| | * Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5563917 This stops packaging the startcts script and the cts.jar into the android-cts.zip. Since we are only testing using Tradefed, we should prevent confusion by removing the old test runner. Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
* | | Merge "stop using a custom linker script for static executables."Nick Kralevich2011-11-021-1/+1
|\ \ \
| * | | stop using a custom linker script for static executables.Nick Kralevich2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is causing problems with making the linker relocatable. Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
* | | | Allow to set ANDROID_BUILDSPEC as path of buildspec.mkYing Wang2011-11-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So that clients can set a custom buildspec.mk without adding buildspec.mk at the top dir. Change-Id: Ic15efa6cfbf00f04db35447e70bb5bdd63a5058c
* | | | am 0c8f79dd: am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1Dianne Hackborn2011-11-021-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '0c8f79dd01366a45b255584ef279e498741728e4': MR1 is version 4.1, API 15.
| * | | MR1 is version 4.1, API 15.Dianne Hackborn2011-11-021-2/+2
| | | | | | | | | | | | | | | | Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
* | | | Revert "Build cache.img."Ying Wang2011-11-023-39/+3
| | | | | | | | | | | | | | | | This reverts commit 531bdb546af5127ed9c1012871d780930eb990f5.
* | | | Build cache.img.Ying Wang2011-11-013-3/+39
| |/ / |/| | | | | | | | Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
* | | Fix build.Ying Wang2011-10-311-2/+2
| | | | | | | | | | | | Change-Id: I166d4e0c5cc4d2b58c7af3f0207b2d161a9d1715
* | | Unify the user image building codeYing Wang2011-10-311-56/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5398808 Before this change we have duplicate code in the Makefile and the python-based releasetool. That's a real headache to maintain. Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
* | | am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP masterJean-Baptiste Queru2011-10-281-1/+1
|\ \ \ | |/ / | | | | | | * commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':
* | | Merge "Add TARGET_COPY_OUT_* variables."Ying Wang2011-10-271-5/+13
|\ \ \
| * | | Add TARGET_COPY_OUT_* variables.Ying Wang2011-10-271-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are relative to PRODUCT_OUT so can be used in PRODUCT_COPY_FILES. If TARGET_COPY_OUT_VENDOR instead of hardcoded system/vendor is used, we will be able to transition smoothly to a separate vendor staging directory. Change-Id: Ia9fdb208768cf4699180306280b4c02421b2ea9c
* | | | Merge "Fix build problems with gcc-4.6.x."Jing Yu2011-10-271-4/+5
|\ \ \ \
| * | | | Fix build problems with gcc-4.6.x.Doug Kwan2011-10-131-4/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
* | | | | Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE"Conley Owens2011-10-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCEJim Huang2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While building Android with latest host gcc, it causes the following build error: Install: out/host/linux-x86/bin/mkbootimg host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] <built-in>:0:0: note: this is the location of the previous definition cc1plus: all warnings being treated as errors In order to make build system happy, this patch does unset macro _FORTIFY_SOURCE and then define it in host cflags. Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
* | | | | am 00d1d614: am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" ↵Ying Wang2011-10-274-7/+21
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '00d1d614f6e9c29e366b2608cd37814856df5efc': new LOCAL_DEX_PREOPT option "nostripping"
| * | | | am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0Ying Wang2011-10-274-7/+21
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b': new LOCAL_DEX_PREOPT option "nostripping"
| | * | | new LOCAL_DEX_PREOPT option "nostripping"Ying Wang2011-10-244-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip the classes.dex. Bug: 5396625 5502338 Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
| * | | | set ID to MR1. Please do not merge.Ed Heyl2011-10-251-1/+1
| | |/ / | |/| | | | | | | | | | Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
* | | | Remove last reference to layoutopt.Xavier Ducrohet2011-10-261-1/+0
| | | | | | | | | | | | | | | | Change-Id: Ifdcf35e0bda41fbb5f04515a4b0f1c60dd130d50
* | | | Remove references to layoutopt from the build.Xavier Ducrohet2011-10-262-2/+0
| | | | | | | | | | | | | | | | Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
* | | | Revert "Remove layoutopt; replaced by the more generic "lint" tool."Omari Stephens2011-10-262-0/+3
| | | | | | | | | | | | | | | | This reverts commit 7a23d45cdca22751c421427ce0e4e12df31945d2.
* | | | Merge "Remove layoutopt; replaced by the more generic "lint" tool."Tor Norbye2011-10-262-3/+0
|\ \ \ \
| * | | | Remove layoutopt; replaced by the more generic "lint" tool.Tor Norbye2011-10-262-3/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
* | | | | enable PIE for dynamically linked executablesNick Kralevich2011-10-241-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile all programs on Android with -fPIE and -pie. This enables PIE (Position Independent Executables), which helps protect Android applications from exploitation due to memory management bugs. Stop using the armelf.x linker script. This script hard codes the load address of the executable, defeating the position independence PIE requires. Note: PIE *static* executables are not supported at this time and require additional linker changes. Bug: 5323301 Change-Id: Ieafcc9c4f142495847e163881889d371a59d0878
* | | | Change BUILD_ID.Wink Saville2011-10-211-1/+1
|/ / / | | | | | | | | | | | | | | | On master branch build id should be MASTER. Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
* | | Build fix - include sdk/lint in buildTor Norbye2011-10-201-0/+1
| | | | | | | | | | | | Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
* | | Merge "Compile each proto file separately"Bjorn Bringert2011-10-181-5/+7
|\ \ \
| * | | Compile each proto file separatelyBjorn Bringert2011-10-181-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, if a module had several proto source files, they would all be compiled in a single invocation of aprotoc. If any of the files imported one of the other files, you got an aprotoc error about duplicates. And if you removed the files that were imported from the list of source files, no Java code would be generated for the imported files, causing a Java compile time error. This changes compiles each proto file separately, which avoids both of the problems above. It's slightly more inefficient, but aprotoc is really fast. Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
* | | | am 55370202: Remvoe whisperd from user_tags.mk.Ying Wang2011-10-171-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '5537020242a499e54c351ced962fe437ae1fc4d2': Remvoe whisperd from user_tags.mk.
| * | | Remvoe whisperd from user_tags.mk.Ying Wang2011-10-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469 Bug: 5473754
* | | | am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-175-1/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3': New PRODUCT_AAPT_PREF_CONFIG.
| * | | New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-145-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use the new aapt --preferred-configurations option. For use with Prime to be able to strip everything but xhdpi density bitmaps selectively, not stripping when this would result in no data for the resource. Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
* | | | Support to package prebuilt NDK libstlport_shared.so into apkYing Wang2011-10-131-0/+12
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To package libstlport_shared.so, use the following syntax in the app module definition: LOCAL_NDK_STL_VARIANT := stlport_shared LOCAL_NDK_VERSION := <num> The rationale behind is: The NDK prebiult libstlport_shared.so is intentionally different from the system libstlport.so. Essentially they are slightly different versions of the library so shouldn't be mixed up. libstlport.so is used by the system, but not exposed by the NDK, it is routinely tweaked in various ways between platform releases, and there is no guarantee that its ABI is stable, or that it will not be replaced by something else in the future. libstlport_shared.so is typically distributed with application packages, and should not be part of the system. Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22
* | | am 854233e9: core: remove the built fake packages (not installed) on ↵Dima Zavin2011-10-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | installclean * commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84': core: remove the built fake packages (not installed) on installclean
| * | core: remove the built fake packages (not installed) on installcleanDima Zavin2011-10-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637 Signed-off-by: Dima Zavin <dima@android.com>
* | | am 7dac5909: core: remove fake package timestamps on installcleanDima Zavin2011-10-111-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756': core: remove fake package timestamps on installclean
| * | core: remove fake package timestamps on installcleanDima Zavin2011-10-111-1/+2
| | | | | | | | | | | | | | | Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52 Signed-off-by: Dima Zavin <dima@android.com>
* | | Merge "Use shell variable to eliminate $(eval) in commands."Ying Wang2011-10-111-4/+3
|\ \ \