summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Allow swtmenubar module to be buildable on Windows.Raphael Moll2011-04-141-0/+1
| | | | Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
* Fix "argument list too long"Ying Wang2011-04-141-5/+21
| | | | | | Bug http://b/issue?id=2718472 Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
* Add NDK crtbegin_so.o and crtend_so.o if they exist.Ying Wang2011-04-081-5/+2
| | | | Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
* Merge "Use my-dir in a consistent way as others"Ying Wang2011-03-311-1/+1
|\
| * Use my-dir in a consistent way as othersChih-Wei Huang2011-03-111-1/+1
| | | | | | | | Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
* | build speedup: Do not use shell 'find' function to look for NOTICE files.David 'Digit' Turner2011-03-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The GNU Make wildcard function can be used to look for a specific file and is _much_ faster than invoking the find command through $(shell ...). Since notice_files.mk is included by base_rules.mk for each and every module in the build tree, this represents a considerable speed-up. For example, when building the full-eng product from the AOSP tree, the no-op "make" goes from 21 seconds to 16 seconds with this patch applied. Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
* | Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do ↵Raphael2011-03-243-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | not merge. When the build is invoked with the fake target "sdk_repo" and a main target of sdk, win_sdk or sdk_addon, we now create packages in DIST_DIR that can directly be used to populate the SDK Repository. This is quite close to how we actually distribute the SDK. Change-Id: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
* | Support target-specific sdk/build/tools.atree extension.David 'Digit' Turner2011-03-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this patch is to add the ability to specify a target-specific extension to sdk/build/tools.atree, under the name sdk/build/tools.$(TARGET_ARCH).atree This is needed to move x86-specific changes out of tools.atree in order to fix the build of internal Android branches that don't include other x86-related changes to the build system. Another patch, following this patch, will fix the build itself by moving the x86-stuff to sdk/build/tools.x86.atree. NOTE: The root cause of the problem is that tools.atree probably shouldn't be in the public AOSP repository, but under development/build/ instead. However, fixing this requires more drastic changes to the build system. Change-Id: Ie365c55527bcad38e1e5248f618e2fd5a96431a1
* | x86: the -mbionic flag is needed for IA builds.Bruce Beare2011-03-151-0/+1
| | | | | | | | | | Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | x86: qemu emulator is the default build targetBruce Beare2011-03-152-6/+8
| | | | | | | | | | | | Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* | Merge "Allow win_sdk build with USE_CCACHE=1"David 'Digit' Turner2011-03-151-7/+17
|\ \ | |/ |/|
| * Allow win_sdk build with USE_CCACHE=1David 'Digit' Turner2011-03-151-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the Window sdk build (lunch sdk-eng; make win_sdk) to work properly when USE_CCACHE is defined in the environment. There is no Windows ccache prebuilt, but since we're cross-compiling from Linux, detect it and use the linux prebuilt binary instead. Note: Depends on https://review.source.android.com//#change,21755 for a complete solution to the problem. Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
* | Merge "Fix find-jdk-tools-jar to be cygwin-friendly."Raphael Moll2011-03-101-3/+3
|\ \ | |/ |/|
| * Fix find-jdk-tools-jar to be cygwin-friendly.Raphael Moll2011-03-081-3/+3
| | | | | | | | Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
* | Merge "x86: Use GCC 4.4.3"David Turner2011-03-041-4/+3
|\ \ | |/ |/|
| * x86: Use GCC 4.4.3Bruce Beare2011-03-011-4/+3
| | | | | | | | | | | | Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767 Author: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | am 951a3e5f: Merge "Build system tweaks for Valgrind."Kenny Root2011-02-178-21/+24
|\ \ | |/ | | | | | | * commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0': Build system tweaks for Valgrind.
| * Build system tweaks for Valgrind.Jeff Brown2011-02-168-21/+24
| | | | | | | | | | | | | | | | | | | | | | Added LOCAL_NO_CRT to enable building executables that do not link to the C runtime library. Removed support for LOCAL_MODULE_SUBDIR since it was broken and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH instead.) Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
* | am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the ↵David 'Digit' Turner2011-02-152-1/+2
|\ \ | |/ | | | | | | | | | | build." * commit '86a903647f3f3df4484396ec58ba5b0454abd36e': core/binary.mk: Add missing Objective-C objects to the build.
| * core/binary.mk: Add missing Objective-C objects to the build.David 'Digit' Turner2011-02-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, all_objects was not listing objects generated from objective-C sources. We need these for the emulator (which builds its own version of SDL which uses Quartz on OS X). + Fix a typo in transform-host-m-to-o definition. This also explains why https://review.source.android.com/#change,21074 had to be reverted, since it gets rid of the prebuilt SDL libraries when building the emulator. Change-Id: I173811cf11cdb5b045073aade59364236145bc77
* | am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from ↵Raphael2011-02-041-0/+13
|\ \ | | | | | | | | | | | | | | | | | | HC. Do not merge. * commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72': merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
| * | merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not ↵Raphael2011-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | merge. Depends on change 8252cdea from development to get the verbose/quiet flag for mkstub. Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
* | | am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"Raphael Moll2011-02-031-0/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'a15717c9905e32f2724645e3734567c40d8d3eb0': SDK: Enable "make sdk/common" under Windows
| * | SDK: Enable "make sdk/common" under WindowsRaphael Moll2011-02-021-0/+1
| | | | | | | | | | | | Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
* | | am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."Raphael2011-02-031-1/+10
|\ \ \ | |/ / | | | | | | | | | * commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848': SDK: Strip llvm-rs-cc in SDK.
| * | SDK: Strip llvm-rs-cc in SDK.Raphael2011-02-021-1/+10
| | | | | | | | | | | | | | | | | | SDK Bug: 3394374 Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
* | | am d7798a7e: fix TINY ANDROID yet again...Brian Swetland2011-02-021-0/+2
|\ \ \ | | |/ | |/| | | | | | | * commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719': fix TINY ANDROID yet again...
| * | fix TINY ANDROID yet again...Brian Swetland2011-02-021-0/+2
| | | | | | | | | | | | Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
* | | Merge from open-source masterJean-Baptiste Queru2011-01-311-0/+2
|\ \ \ | | |/ | |/| | | | Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
| * | partial build fixJean-Baptiste Queru2011-01-311-0/+1
| | | | | | | | | | | | Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
| * | partial build fixJean-Baptiste Queru2011-01-311-0/+1
| | | | | | | | | | | | Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
* | | am 61356271: am e388ac10: Merge "Extra protobuf-related support"Jean-Baptiste Queru2011-01-274-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '6135627140bd799ee56ba894b69a9455ca0af86a': Extra protobuf-related support
| * | Extra protobuf-related supportJean-Baptiste Queru2011-01-274-0/+10
| | | | | | | | | | | | Change-Id: I375d32f0bcb695ccb0603743133034941d584163
* | | am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"Jean-Baptiste Queru2011-01-276-6/+130
|\ \ \ | |/ / | | | | | | | | | * commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9': Protobuf compiler support in the build system
| * | Protobuf compiler support in the build systemJean-Baptiste Queru2011-01-276-6/+130
| | |
* | | am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"Jean-Baptiste Queru2011-01-271-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'f273723f7710bb127ee1026e05049e4ee5290c8a': A few more grandfathered user tags
| * | A few more grandfathered user tagsJean-Baptiste Queru2011-01-271-0/+3
| | | | | | | | | | | | Change-Id: I57309b461ec2395da068961f976c904bd3474e88
| * | Add a few more legacy modules that can have user tags - do not mergeJean-Baptiste Queru2011-01-271-0/+22
| | | | | | | | | | | | Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
* | | am 928a0304: re-merge from readonly-korg-master - do not mergeJean-Baptiste Queru2011-01-271-0/+22
|\ \ \ | | | | | | | | | | | | | | | | * commit '928a03043187b7c4843b2c832b589c57b7541e4a': re-merge from readonly-korg-master - do not merge
| * | | re-merge from readonly-korg-master - do not mergeJean-Baptiste Queru2011-01-271-0/+22
| |/ / | | | | | | | | | Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
| * | Merge "Add support for custom Linux host toolchains when building the SDK."David 'Digit' Turner2011-01-162-4/+24
| |\ \
| | * | Add support for custom Linux host toolchains when building the SDK.David 'Digit' Turner2011-01-162-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in order to build Linux SDK binaries that can run properly on Ubuntu 8.04 (Hardy). By default, the host toolchain on 10.04 (Lucid) generates machine code that won't run on Hardy due to GLibc ABI mistmatches. Note that nothing happens if the new toolchain is not in the prebuilt tree. Change-Id: I914f5a303f16b6871759ce5a7178585ed3060870
| * | | merge from gingerbreadJean-Baptiste Queru2011-01-141-9/+10
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
* | | | Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not mergeJean-Baptiste Queru2011-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e1ce27c08ec57032520613488ec2fe5b3795126, reversing changes made to 7dfc1270967c96be6dcd58fb7770c07482a7e90d. Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
* | | | Merge commit '50738779' into gingerbread-plus-aospEd Heyl2011-01-201-2/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: core/version_defaults.mk Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
| * | | DO NOT MERGE Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
* | | | am a4781e86: Merge from open-source gingerbreadJean-Baptiste Queru2011-01-141-9/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00': CTS: pass vogar expectation location to CollectAllTests.
| * | | Merge from open-source gingerbreadJean-Baptiste Queru2011-01-141-9/+10
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
| | * | CTS: pass vogar expectation location to CollectAllTests.Brett Chabot2011-01-071-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug 3181338 Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
| | * | 2.3.1android-merger2010-12-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
generated by cgit v1.1 at 2025-02-19 06:52:22 +0000