aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-13[DO NOT MERGE] filter -Werror if host gcc version doesn't matchgingerbreadYing Wang
Change-Id: I180bb48b1c64888f8c01881acffde8e22cbdee9a
2011-11-22Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.android-cts-2.3_r12android-cts-2.3_r11Ying Wang
So that prebuilt shared libraries can be referenced with the module name in other module's Android.mk. This is a clean cherrypick from later branches. Bug: 5652242 Change-Id: I850978251a23808559d30025a9c519fe8e59594a
2011-09-29Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT ↵android-cts-2.3_r10David Turner
MERGE" into gingerbread
2011-09-29core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGEDavid 'Digit' Turner
NOTE: This is a back-port from AOSP into the internal gingerbread branch. 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: I03e179f3216ed95908bf8e8011d34109accff1b9 Orig-Change-Id: I173811cf11cdb5b045073aade59364236145bc77
2011-09-29Merge "emulator: enable opengl emulation modules" into gingerbreadDavid 'Digit' Turner
2011-09-22Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into ↵David 'Digit' Turner
gingerbread
2011-09-16emulator: enable opengl emulation modulesDavid 'Digit' Turner
This patch defines BUILD_EMULATOR_OPENGL to 'true' to enable the OpenGLES emulation modules under development/tools/emulator/opengl to be built. Change-Id: I130b5026909ce43578ead8bebe889075d90c4486
2011-09-08Rename generic_arm5 to generic_armv5Brian Muramatsu
Bug 5267392 Change-Id: I5129d5ba283e711a2cb5840fc0c9b707f653936a
2011-09-07Disable Dexpreopt for generic_arm5Brian Muramatsu
Bug 5267392 After coming across another place where I would have to use package.apk.unaligned, I decided maybe it is best to just disable dexpreopt as was previously suggested. Use package.apks in the CTS Makefile task. Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
2011-09-07generic_arm5 productBrian Muramatsu
Bug 5267392 Copied the prior generic product but tried to include Makefiles from the generic product when possible to avoid drifting. Change-Id: I7893adb65c37c1257bcb5224848f4cd7cd93d2f9
2011-09-07Allow uninstallable APPs.Ying Wang
Bug: 5264671 This is needed by cts tests. It's harmless to existing modules. Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
2011-09-02Use package.apk.unaligned in CTS BuildBrian Muramatsu
Bug 5252989 This prevents dexopt installation failures when trying to install CTS apks on production devices. Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
2011-08-31sdk: Fix broken google_sdk and google_sdk_x86 add-on build.David 'Digit' Turner
This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon and PRODUCT-google_sdk_x86-sdk_addon. Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
2011-08-02Updating version to 2.3.7 to reflect some patches.Dan Morrill
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
2011-08-02Bumping version to 2.3.6 to reflect a few patches.Dan Morrill
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
2011-07-11Switch Unbundled apps from generic.mk to full.mk.Ying Wang
Change-Id: Ib0b84e041275a5ad389a122f0349a85008496be2
2011-07-08merge intel x86 patches into gingerbread branchDavid 'Digit' Turner
2011-07-08sdk-addon.mk: Copy image files to ABI-specific dirDavid 'Digit' Turner
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
2011-07-08emulator: Enable dex-preoptimizationDavid 'Digit' Turner
Backport from AOSP master. This enables the Dex pre-optimization for emulator-specific builds. The idea is to speed up the initial boot sequence of an SDK AVD by avoiding the costly on-device preopt pass that is performed otherwise the first time the AVD is launched. Benchmarking shows reductions in first boot time from 1m30s to 40s on a 2.4GHz Xeon when emulating the AOSP master ToT. Change-Id: Ibf5ebe68aa4d363c9df05d2ffe7cb828ef99f922 Orig-Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-07-07sdk: provide ABI-dependent atree filesDavid 'Digit' Turner
Backport from AOSP master This patch allows development/sdk/ to provide ABI-specific .atree files. This is useful to copy prebuilt CPU model-specific files to the SDK platform image directory. This is needed to deal with the fact that for ARMv7 platform builds, the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead of prebuilt/android-arm/kernel/qemu Change-Id: Ib76caa54a059eca2dafc9cdba812b29f98b5e3c3 Orig-Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
2011-07-07emulator: Build emulator platform images as ARMv7-ADavid 'Digit' Turner
Backport from AOSP master. Now that the emulator supports proper ARMv7 emulation, switch to building all emulator-specific platform images using this instruction set, in order to benefit from the noticeable speed boost provided by Thumb-2 instructions. Note that we don't build with NEON support because emulated NEON instructions are currently slow, though they work. IMPORTANT: You need to have the following emulator patch in your tree in order to start these platform builds easily: https://review.source.android.com//#change,23798 Otherwise, the alternative is to do these things: 1/ Telling the emulator to emulate an ARMv7-A CPU, instead of an ARMv5TE one. This is normally done with "-qemu cortex-a8" 2/ Using an ARMv7-A capable kernel image, which is available and usable with -kernel prebuilt/android-arm/kernel-qemu-armv7 Note that the emulator has a special hack that automatically enables 1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7, then emulate an ARMv7-A CPU automatically). So in reality, only 2/ is required. Change-Id: Id3ac7cdbda892e519af98aff1f02136f344406b8 Orig-Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-07-07x86: Add proper gcc-4.4.3 x86 toolchain support.Bruce Beare
This patch combines 7 AOSP patches to add proper support to build x86 platform images using the 4.4.3 toolchain. The Orig-Changed-Id fields below correspond to the change ids of the original changes in the AOSP master branch history. Define __ANDROID__ for x86 to be on par with ARM build requirements Orig-Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com> Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build. Orig-Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings Change-Id: I9ba661d68a3b375c21eb6b56442d8ba66a5369b3 Orig-Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> x86: Use GCC 4.4.3 Orig-Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767 Author: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> x86: the -mbionic flag is needed for IA builds. Orig-Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> x86: Disable stack-protector until bionic is fixed Orig-Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Clean up of X86 build flags Orig-Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e Signed-off-by: Mark D Horn <mark.d.horn@intel.com> Author: Bruce Beare <bruce.j.beare@intel.com> x86: Enable -fstack-protector Orig-Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07sdk: Add pc-bios files for IA qemu emulatorBruce Beare
Orig-Change-Id: Ia919ff57295cd020810989f241da713210bc8720 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07x86: qemu emulator is the default build targetBruce Beare
Change-Id: I200536d2d997eda6a6e62eaa9050269e3c7ff6c4 Orig-Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-07-07Add full_x86 product.Jean-Baptiste Queru
By inheriting from full, this will be more self-maintaining, and automatically gets a better-configured variant (e.g. it has locales, a date format, etc...). Orig-Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2011-07-07x86: sdk_x86 build targetBruce Beare
Orig-Change-Id: I3876246ddf884ffd09ff0f8e3e300dffb4a332f0 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Minor cleanup - DO NOT MERGEJean-Baptiste Queru
Orig-Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2011-07-07Clean up full config - DO NOT MERGEJean-Baptiste Queru
This splits the existing full.mk in two parts: -One is the device-independent full_base.mk -The other is the emulator-specific device.mk This way we'll be able to inherit from full_base.mk for on-device builds without any emulator-specific files getting in the way. Change-Id: I7f8254bf8c1177594fbdfbdb082bdc429a4a5b25 Orig-Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2011-07-07Make a full list of locales availableJean-Baptiste Queru
Use it for the sim build and full build. Change-Id: I0050f9ee10aafa96cb89cad5d3f492bb1839e331 Orig-Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
2011-07-07Truly default to the full config.Jean-Baptiste Queru
It is much better than generic for emulator-based work. Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2011-07-07generic_x86 builds don't need/use the sparse ext4 format.Bruce Beare
Orig-Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Use ext4 file system for generic_x86 userdata partitionBruce Beare
Orig-Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07GB Updates for init.rc and boot command lineDavid 'Digit' Turner
Change-Id: Iae0f5b1eda109f99be6c484082abebc7b51adf51 Orig-Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value ↵Bruce Beare
across architectures Orig-Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Display the TARGET_ARCH_VARIANTBruce Beare
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Add generic_x86-eng to the lunch menuBruce Beare
Orig-Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Move buildspec vars to BoardConfig.mkBruce Beare
Orig-Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-07-07Vendorsetup needs to look in additional places.Bruce Beare
Orig-Change-Id: I698856f8e02487322540e804c038bba28cc23532 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Allow TARGET_ARCH to be set from BoardConfig.mkBruce Beare
Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07Refactor Stripper. Allow a stripper other than SOSLIM to be specifiedBruce Beare
Orig-Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-06-16Adding a cleanspec to pick up version change. Do not merge.android-cts-2.3_r5Dan Morrill
Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61
2011-06-16Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbreadEd Heyl
2011-06-09Update version to 2.3.5.Dan Morrill
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
2011-06-07add ANDROID_HOST_OUT to env (please do not merge)Ed Heyl
Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5
2011-06-01Merge from open-source gingerbreadJean-Baptiste Queru
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
2011-05-31Merge "Relax the constraint of 64bit build environment." into gingerbreadandroid-cts-2.3_r4Jean-Baptiste Queru
2011-05-26Support to run dex-preopt on prebuilt apks.Ying Wang
Change-Id: I11450310144cb8d7f127c427ada4a0589e030843
2011-05-24Relax the constraint of 64bit build environment.Ying Wang
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-03-24Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do ↵android-sdk-2.3.4_r1android-cts-2.3_r3Raphael
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: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-23Disable dexpreopt for unbundled build.Ying Wang
Cherry-picked from Honeycomb. Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885