aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-16Merge "Add explicit LOCAL_ASFLAGS=-m32 for x86 target"HEADandroid-l-preview_r2android-4.4w_r1tools_r22.2mastermainl-previewkitkat-wearidea133-weekly-releaseidea133Andrew Hsieh
2013-08-15Add explicit LOCAL_ASFLAGS=-m32 for x86 targetPavel Chupin
Required for build with multilib compiler. Change-Id: Ia298a263ff365e48d947628fca3a9bbbab4b7866 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-05-22Merge "gcc 4.6: don't reorder functions"android-sdk-support_r11android-sdk-adt_r20android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22tools_r21tools_r20kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-factory-releasejb-mr1-dev-plus-aospjb-mr1-devics-plus-aospJean-Baptiste Queru
2012-05-22gcc 4.6: don't reorder functionsBruce Beare
Change-Id: I7000e8c7ca64c63c8f6cb394261eddc6e3b7ed3a Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-20Merge "Change the -Ttext value in hexadecimal for ld.gold"Andrew Hsieh
2012-05-21Change the -Ttext value in hexadecimal for ld.goldHaitao Feng
ld.gold could not parse 7C00 as the parameter is treated as a decimal number. The ld.bfd expects a hexadecimal number while ld.gold expects a uint64 by using strtoull. So unify the value in hexadecimal for both ld.bfd and ld.gold. Change-Id: I65fff5947b93fcd47bbc787fd782cc684aa7473f
2011-07-13am e857d898: am 6697426a: am c50afe92: merge intel x86 patches into ↵android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.1_pre2android-4.1_pre1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.1-sdk_pre1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.4-aah_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1jb-releasejb-mr0-releasejb-devics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseics-aah-releaseDavid 'Digit' Turner
gingerbread branch * commit 'e857d8986fb13cd05e30c9c58939580282131b10': Add missing LOCAL_MODULE_TAGS defns.
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
Bug: 5010576 Change-Id: I0f0a368462aa5ec160ca393ea3614f58c77a2fa0
2011-07-11am 6697426a: am c50afe92: merge intel x86 patches into gingerbread branchDavid 'Digit' Turner
* commit '6697426a3623c1f90d519a47988ed8d0a8e89f5e': Add missing LOCAL_MODULE_TAGS defns.
2011-07-11am c50afe92: merge intel x86 patches into gingerbread branchDavid 'Digit' Turner
* commit 'c50afe926cb430059604727b3d6336c580f425ad': Add missing LOCAL_MODULE_TAGS defns.
2011-07-08merge intel x86 patches into gingerbread branchandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadDavid 'Digit' Turner
2011-06-08Add missing LOCAL_MODULE_TAGS defns.Bruce Beare
Orig-Change-Id: I89c7b77de9d4150d31d66c4d75dc587b534f2a26 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-02-03Fix x86 build. Probably not functional.Jean-Baptiste Queru
Change-Id: I25ac45cc72c45f9bbe263c91488981b715b76db5
2010-12-29Merge "Add missing LOCAL_MODULE_TAGS defns."android-sdk-tools_r12android-sdk-adt_r12Jean-Baptiste Queru
2010-12-27Add missing LOCAL_MODULE_TAGS defns.Bruce Beare
Change-Id: I89c7b77de9d4150d31d66c4d75dc587b534f2a26 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-05-10merge from open-source masterandroid-sdk-tools_r7android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r1android-adt-0.9.9android-adt-0.9.8android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1tools_r9tools_r8tools_r7gingerbread-releasegingerbread-mr4-releasefroyo-plus-aospThe Android Open Source Project
Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3
2010-05-07Disk Installer boot and install from /dev/sdbBruce Beare
The grub menu for Android now includes a specific entry for installing from /dev/sdb for use with VirtualBox. Change-Id: Ic1a25d5e337d29c1f1dd3a72b3d2a0f2a7459ae2
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1froyo-releasefroyoJean-Baptiste Queru
Change-Id: I3c6b77b7f7e998f2e236612650693bc238175568
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-04-22Merge donut into masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5donut-release2donut-releasedonutcupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project