OSDN Git Service
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:59:56 +0000 (14:59 -0800)]
merge from open-source master
Chad Fawcett [Thu, 15 Oct 2009 21:53:58 +0000 (17:53 -0400)]
Update prebuilt flex-2.5.4a to i386
The version of flex 2.5.4 included in prebuilt was compiled for the
ppc architecture.
OS X 10.6 (Snow Leopard) does not install Rosetta by default to allow the
execution of ppc binaries, which causes build issues with webkit on that
platform. This commit is a fresh compile of flex 2.5.4 as an i386 binary
which should work for all darwin-x86 platforms.
The build error encountered:
Target Generated: libwebcore <= external/webkit/WebCore/css/tokenizer.flex
You need the Rosetta software to run flex-2.5.4a. The Rosetta installer is
in Optional Installs on your Mac OS X installation disc.
The output of "lipo -info flex-2.5.4a" before commit:
Non-fat file: flex-2.5.4a is architecture: ppc
Output of "lipo -info flex-2.5.4a" with this change:
Non-fat file: flex-2.5.4a is architecture: i386
Binary was compiled with gcc-4.0 with the -arch i386 flag.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:20 +0000 (16:02 -0700)]
merge from open-source master
Ed Heyl [Wed, 7 Oct 2009 18:58:14 +0000 (11:58 -0700)]
am
06b921bb: Revert "Check in a new toolchain fixing issue
2139334."
Merge commit '
06b921bbac9351e641cb16bc9b64ea2b893bd4eb' into eclair-plus-aosp
* commit '
06b921bbac9351e641cb16bc9b64ea2b893bd4eb':
Revert "Check in a new toolchain fixing issue
2139334."
Jing Yu [Wed, 7 Oct 2009 18:53:06 +0000 (11:53 -0700)]
am
e0ea05a2: Check in a new toolchain fixing issue
2139334.
Merge commit '
e0ea05a29f6e673096867b44bb2e730be80fdd35' into eclair-plus-aosp
* commit '
e0ea05a29f6e673096867b44bb2e730be80fdd35':
Check in a new toolchain fixing issue
2139334.
Romain Guy [Wed, 7 Oct 2009 18:44:44 +0000 (11:44 -0700)]
am
2e76efa3: Merge change I58645edd into eclair
Merge commit '
2e76efa3fd419cf5c363e6a12b3ca1b266ad793c' into eclair-plus-aosp
* commit '
2e76efa3fd419cf5c363e6a12b3ca1b266ad793c':
Add Groovy library; for the new layoutopt tool.
David 'Digit' Turner [Wed, 7 Oct 2009 18:43:40 +0000 (11:43 -0700)]
am
6342dcb2: am
f816627d: Update emulator-specific kernel image to 2.6.29
Merge commit '
6342dcb25c911e2944ff1899ff9297157dbc023f' into eclair-plus-aosp
* commit '
6342dcb25c911e2944ff1899ff9297157dbc023f':
Update emulator-specific kernel image to 2.6.29
Ben Cheng [Wed, 7 Oct 2009 18:38:51 +0000 (11:38 -0700)]
am
3056a849: Create 32- and 64-bit versions of OProfile host tools for post processing.
Merge commit '
3056a8492113a17f3c0ac53796ce28fafae09345' into eclair-plus-aosp
* commit '
3056a8492113a17f3c0ac53796ce28fafae09345':
Create 32- and 64-bit versions of OProfile host tools for post processing.
Ed Heyl [Tue, 6 Oct 2009 23:15:41 +0000 (16:15 -0700)]
am
d7cd1906: am
06b921bb: (-s ours) Revert "Check in a new toolchain fixing issue
2139334."
Merge commit '
d7cd190617334d4c5b0db7dbabb9d45759cf9400' into eclair-mr2-plus-aosp
* commit '
d7cd190617334d4c5b0db7dbabb9d45759cf9400':
Revert "Check in a new toolchain fixing issue
2139334."
Ed Heyl [Tue, 6 Oct 2009 23:09:22 +0000 (16:09 -0700)]
am
06b921bb: (-s ours) Revert "Check in a new toolchain fixing issue
2139334."
Merge commit '
06b921bbac9351e641cb16bc9b64ea2b893bd4eb' into eclair-mr2
* commit '
06b921bbac9351e641cb16bc9b64ea2b893bd4eb':
Revert "Check in a new toolchain fixing issue
2139334."
Ed Heyl [Tue, 6 Oct 2009 22:34:57 +0000 (15:34 -0700)]
Revert "Check in a new toolchain fixing issue
2139334."
This reverts commit
e0ea05a29f6e673096867b44bb2e730be80fdd35. Please do not merge.
As per Dr. No
Jing Yu [Tue, 6 Oct 2009 17:15:02 +0000 (10:15 -0700)]
am
e0ea05a2: Check in a new toolchain fixing issue
2139334.
Merge commit '
e0ea05a29f6e673096867b44bb2e730be80fdd35' into eclair-mr2-plus-aosp
* commit '
e0ea05a29f6e673096867b44bb2e730be80fdd35':
Check in a new toolchain fixing issue
2139334.
Jing Yu [Tue, 6 Oct 2009 04:48:40 +0000 (21:48 -0700)]
Check in a new toolchain fixing issue
2139334.
The toolchain source is the same as before, but with a GCC patch
that fixes the float point combination bug.
Romain Guy [Mon, 5 Oct 2009 17:12:49 +0000 (10:12 -0700)]
am
2e76efa3: Merge change I58645edd into eclair
Merge commit '
2e76efa3fd419cf5c363e6a12b3ca1b266ad793c' into eclair-mr2-plus-aosp
* commit '
2e76efa3fd419cf5c363e6a12b3ca1b266ad793c':
Add Groovy library; for the new layoutopt tool.
Android Git Automerger [Mon, 5 Oct 2009 17:12:44 +0000 (10:12 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/prebuilt into eclair-mr2-plus-aosp
Android (Google) Code Review [Mon, 5 Oct 2009 10:57:03 +0000 (06:57 -0400)]
Merge change I58645edd into eclair
* changes:
Add Groovy library; for the new layoutopt tool.
Romain Guy [Mon, 5 Oct 2009 09:23:54 +0000 (02:23 -0700)]
Add Groovy library; for the new layoutopt tool.
Change-Id: I58645eddeef84cb2ab92bd545247ff56e6981e34
David 'Digit' Turner [Sun, 4 Oct 2009 22:06:20 +0000 (15:06 -0700)]
am
f816627d: Update emulator-specific kernel image to 2.6.29
Merge commit '
f816627d538c97035eaa40ebb3005f6a5849e471' into eclair
* commit '
f816627d538c97035eaa40ebb3005f6a5849e471':
Update emulator-specific kernel image to 2.6.29
David 'Digit' Turner [Fri, 2 Oct 2009 21:33:07 +0000 (14:33 -0700)]
Update emulator-specific kernel image to 2.6.29
Ben Cheng [Fri, 2 Oct 2009 17:06:12 +0000 (10:06 -0700)]
Create 32- and 64-bit versions of OProfile host tools for post processing.
android-bc__triaged bug
2162989.
Chih-Chung Chang [Fri, 25 Sep 2009 18:37:49 +0000 (11:37 -0700)]
am
760afe30: Use 32-bit binary for op* executables.
Merge commit '
760afe305be651f0ae8c99c693097ee0482f0c7c' into eclair-plus-aosp
* commit '
760afe305be651f0ae8c99c693097ee0482f0c7c':
Use 32-bit binary for op* executables.
Chih-Chung Chang [Fri, 25 Sep 2009 18:24:08 +0000 (11:24 -0700)]
Use 32-bit binary for op* executables.
David 'Digit' Turner [Thu, 24 Sep 2009 04:35:31 +0000 (21:35 -0700)]
am
0f6e6439: Add prebuilt ARMv7 goldfish kernel images.
Merge commit '
0f6e6439e130013a2011904e195fa625a4127617' into eclair-plus-aosp
* commit '
0f6e6439e130013a2011904e195fa625a4127617':
Add prebuilt ARMv7 goldfish kernel images.
David 'Digit' Turner [Thu, 24 Sep 2009 01:37:52 +0000 (18:37 -0700)]
Add prebuilt ARMv7 goldfish kernel images.
These will be needed to perform dex preoptimization of ARMv7 system images
for -user builds. The binaries were generated from the android-goldfish-2.6.29
branch of kernel/common.git on android.git.kernel.org, with the corresponding
SHA1:
9d8732354c9efc9f5eb6f70a92ab436ccbfdf119
Xavier Ducrohet [Tue, 15 Sep 2009 22:48:37 +0000 (15:48 -0700)]
am
b7e40e78: Merge change 24966 into eclair
Merge commit '
b7e40e78bcea5dd60ea627bf8982023e574c33ae' into eclair-plus-aosp
* commit '
b7e40e78bcea5dd60ea627bf8982023e574c33ae':
Move to SWT 3.5
Android (Google) Code Review [Tue, 15 Sep 2009 22:43:03 +0000 (18:43 -0400)]
Merge change 24966 into eclair
* changes:
Move to SWT 3.5
David 'Digit' Turner [Tue, 15 Sep 2009 15:45:58 +0000 (08:45 -0700)]
am
c7f57c5c: Merge change 24717 into eclair
Merge commit '
c7f57c5c808f7682196a1edb919f61986f800627' into eclair-plus-aosp
* commit '
c7f57c5c808f7682196a1edb919f61986f800627':
This updates the prebuilt linux-x86 audio library used by the emulator.
Android (Google) Code Review [Tue, 15 Sep 2009 15:41:26 +0000 (11:41 -0400)]
Merge change 24717 into eclair
* changes:
This updates the prebuilt linux-x86 audio library used by the emulator.
Xavier Ducrohet [Mon, 14 Sep 2009 23:28:10 +0000 (16:28 -0700)]
Move to SWT 3.5
Change-Id: I89a4aeef0a3ee672d0e2eed77265fd5c831099cc
Ben Cheng [Mon, 14 Sep 2009 23:04:29 +0000 (16:04 -0700)]
am
4fb23ccb: Port OProfile 0.9.5 to Android to support ARMV7-based platforms.
Merge commit '
4fb23ccb699d3160c29d076e3a8d243007688d34' into eclair-plus-aosp
* commit '
4fb23ccb699d3160c29d076e3a8d243007688d34':
Port OProfile 0.9.5 to Android to support ARMV7-based platforms.
Ben Cheng [Mon, 14 Sep 2009 22:51:35 +0000 (15:51 -0700)]
Port OProfile 0.9.5 to Android to support ARMV7-based platforms.
David 'Digit' Turner [Fri, 11 Sep 2009 18:07:32 +0000 (11:07 -0700)]
This updates the prebuilt linux-x86 audio library used by the emulator.
This change corresponds to the big QEMU 10.0.50 integration. Note that
this breaks the library's ABI so committing this change without committing
the corresponding changes to external/qemu will *break* the linux emulator
build.
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:30 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:18 +0000 (14:13 -0700)]
merge from donut
David 'Digit' Turner [Wed, 26 Aug 2009 18:40:10 +0000 (20:40 +0200)]
Update prebuilt Linux emulator audio library (includes esd loop fix)
David 'Digit' Turner [Fri, 21 Aug 2009 01:12:48 +0000 (03:12 +0200)]
Update libqemu-audio.a prebuilt to include EsounD fixes.
Ramanan Rajeswaran [Tue, 18 Aug 2009 17:58:47 +0000 (10:58 -0700)]
am
16f30689: Merge change 21338 into donut
Merge commit '
16f30689dd498791bec0be74e3513252479c4778' into eclair
* commit '
16f30689dd498791bec0be74e3513252479c4778':
Add Jython 2.5 prebuilt jar
Xavier Ducrohet [Tue, 18 Aug 2009 17:58:40 +0000 (10:58 -0700)]
am
a6f67b0d: Add OSGi 4.0 to prebuilt.
Merge commit '
a6f67b0d64cf3553733178f1c64e145a8912aee7' into eclair
* commit '
a6f67b0d64cf3553733178f1c64e145a8912aee7':
Add OSGi 4.0 to prebuilt.
Jing Yu [Mon, 17 Aug 2009 22:24:55 +0000 (15:24 -0700)]
A new 4.4.0 toolchain with a few FDO bugs fixed.
Android (Google) Code Review [Fri, 14 Aug 2009 21:39:30 +0000 (14:39 -0700)]
Merge change 21338 into donut
* changes:
Add Jython 2.5 prebuilt jar
Ramanan Rajeswaran [Fri, 14 Aug 2009 21:24:12 +0000 (14:24 -0700)]
Add Jython 2.5 prebuilt jar
Xavier Ducrohet [Fri, 14 Aug 2009 18:36:11 +0000 (11:36 -0700)]
Add OSGi 4.0 to prebuilt.
This is required dependency for prebuilt/common/eclipse/org.eclipse.jface_3.4.2.jar
Also add some missing NOTICE files for other EPL components.
Android (Google) Code Review [Fri, 7 Aug 2009 23:18:50 +0000 (16:18 -0700)]
Merge change 20476
* changes:
Fix the networking problem in the emulator kernel that caused adb to hang.
Jack Veenstra [Fri, 7 Aug 2009 21:56:05 +0000 (14:56 -0700)]
Fix the networking problem in the emulator kernel that caused adb to hang.
Per our convention, here is the list of changes since the last kernel checkin.
(Not since the rolled back kernel -- that was 2.6.27 -- but since the one
before the rollback that was broken.)
24ee4d2c7d4b25c110761482b2b2b32fe55b6fa2 Merge branch 'android-2.6.29' into android-goldfish-2.6.29
ae69453d664f4e6f1048d07f3205d0c2b65177a8 GRO: Disable GRO on legacy netif_rx path
1c66403baaa883c502bd19bd5566af03e624abbc pmem: Make the exposed functions be noops if CONFIG_ANDROID_PMEM is not set.
0d1060f749aade019e03fa4400e5174ac27a4c30 pmem: Expose is_pmem_file to the in-kernel users.
ff08af1d4a7ce2168516d66b17ff698ad59a95c4 pmem: remove HW3D_* ioctls
2fe6f1892ece942fddd217d672c6432d60ca24ce ptrace: ptrace_attach: fix the usage of ->cred_exec_mutex
db83a334959994d2a617812b8b536d18fa072ce2 serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data.
3509ff633acf767c5b43015e66940ec0dc32d71f mmc: sdio: Claim host in sdio_reset_comm()
0fb20783eef43b8f31c6d4f0df7bff60cb461c45 Revert "mmc: mmcblk: Add new feature 'CONFIG_MMC_BLOCK_PARANOID_RESUME'"
725138d21c1d3d4f0a2ca3b9eb0c1c3f17fd6852 mmc: card: Add MMC_BLOCK_DEFERRED_RESUME option to Kconfig
211121f828139b614d6c7634def7ce1182689ade mmc: mmcblk: Add support for deferred SD bus resume
f901a472254fd7a4b991ca0773302d7a28e822e4 mmc: core: Rework mmc_delayed_work wakelock so that the wakelock is only extended if a card is added or removed.
16734b9782cf2851b992d943e7d9c94f1f635af3 mmc: core: Add deferred bus resume policy.
c7b88835d33184838b25b785d31ff4af612fbb6a Input: gpio_event: Allow multiple input devices per gpio_event device
e73bc4a9c2dd2d8f9f8188ebf9a5aeca302e2a23 Input: gpio_input: Fix keys with keycode 0x100-0x1ff
90e74b2dd48bf58539f71bed8ab84b8cfbdfe5ef Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver
edc71cab6a21fd0415b626bf2cbe737af29e3491 Input: synaptics_i2c_rmi: Send new multi touch events
257f4414a12fcf516becaa8f357883fc3d1586ed Input: add detailed multi-touch finger data report protocol
b63575c57d01d7f438f5de7f9a142343bff0184f Input: allow certain EV_ABS events to bypass all filtering
2a354fe9ebeffb92f3d5ba3a9a95294b6e2aec83 Input: synaptics_i2c_rmi: Add sensitivity adjust option.
198ba7ab3227c06d9ac2b7b90d6b9119ebeac36d Input: synaptics_i2c_rmi: Add support for panels with has-no-relative-data property.
75240fa23c3493988227b90edf622eddb2e125dd Input: synaptics_i2c_rmi: disable_irq -> disable_irq_nosync
d7b0b2043bd9bc5f15bf9a677d59d0d87dd045c2 usb gadget: android: Add helper function for usb_gadget_connect and disconnect.
f7f6469023c8c704157f9932a7639b70936d44b6 net: Force PPPoLAC and PPPoPNS to bind an interface before creating PPP channel.
eebb2700cba487bcda8da153c2e0813ce4b5a11d net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).
964fc4881b3f3c90ec3a59350464d39158b88d52 security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
3de11fd60d9941c720762553a9789dde578b67c9 ashmem: don't require a page aligned size
d89050258f0133ae56d586dd6d7345d473c9a216 net: Fix a potential deadlock while releasing PPPoLAC/PPPoPNS socket.
7df592fda6449de1661b48e3efaa7bd9fae7796c [ARM] 5507/1: support R_ARM_MOVW_ABS_NC and MOVT_ABS relocation types
Doug Kwan [Thu, 6 Aug 2009 00:17:16 +0000 (17:17 -0700)]
Refresh binutils binaries for cortex-a8 workaround bug fix
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:30 +0000 (09:00 -0700)]
merge from open-source master
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:48 +0000 (07:45 -0700)]
merge from donut
Doug Kwan [Tue, 28 Jul 2009 00:24:52 +0000 (17:24 -0700)]
Refresh linker binaries to fix SEGV fault.
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Xavier Ducrohet [Fri, 24 Jul 2009 06:58:44 +0000 (23:58 -0700)]
am
beef5266: Add Apache Commons Compress component.
Merge commit '
beef5266f55e85a1d1722417ae370356495d9728'
* commit '
beef5266f55e85a1d1722417ae370356495d9728':
Add Apache Commons Compress component.
Xavier Ducrohet [Thu, 23 Jul 2009 19:54:00 +0000 (12:54 -0700)]
Add Apache Commons Compress component.
Also fixed wrong prebuilt content for Ant.
Doug Kwan [Thu, 16 Jul 2009 15:46:43 +0000 (08:46 -0700)]
Refresh binaries for Cortex-A8.
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:21 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Android (Google) Code Review [Tue, 14 Jul 2009 21:37:55 +0000 (14:37 -0700)]
Merge change 7142
* changes:
The new toolchain will not search the sysroot path that points to jingyu's home directory.
Jing Yu [Mon, 13 Jul 2009 22:51:24 +0000 (15:51 -0700)]
The new toolchain will not search the sysroot path
that points to jingyu's home directory.
Doug Kwan [Wed, 1 Jul 2009 07:41:13 +0000 (00:41 -0700)]
Revert "Update Linux and OSX hosted tool-chains for cortex-a8 workaround"
This reverts commit
1e2670e8d0cc6b8dec502475c61f6b68f92dfba4.
Doug Kwan [Tue, 30 Jun 2009 02:07:30 +0000 (19:07 -0700)]
Update Linux and OSX hosted tool-chains for cortex-a8 workaround
Raphael Moll [Thu, 25 Jun 2009 21:44:27 +0000 (14:44 -0700)]
am
9994e70e: Revert "Fix swt.jar for linux-x86_64."
Merge commit '
9994e70ef353792971e954fd79dd7e3ac04643b1'
* commit '
9994e70ef353792971e954fd79dd7e3ac04643b1':
Revert "Fix swt.jar for linux-x86_64."
Raphael Moll [Thu, 25 Jun 2009 21:05:55 +0000 (14:05 -0700)]
Revert "Fix swt.jar for linux-x86_64."
This reverts commit
822cc7e5b40673176c5e1b9ab75f48d155d5c193.
https://android-git.corp.google.com/g/Gerrit#change,5178
Android (Google) Code Review [Thu, 25 Jun 2009 17:10:24 +0000 (10:10 -0700)]
Merge change 5296
* changes:
Remove the installed headers that have been defined in Android tree.
David 'Digit' Turner [Thu, 25 Jun 2009 15:04:51 +0000 (08:04 -0700)]
am
2d56d24d: Roll back to 2.6.27 kernel *again*.
Merge commit '
2d56d24dd2af05c952176ed7fdb6fb97aa2f4d0d'
* commit '
2d56d24dd2af05c952176ed7fdb6fb97aa2f4d0d':
Roll back to 2.6.27 kernel *again*.
David 'Digit' Turner [Thu, 25 Jun 2009 12:21:41 +0000 (14:21 +0200)]
Roll back to 2.6.27 kernel *again*.
For some yet-undetermined reason, the 2.6.29 images that were previously
commited do not work well with networking, as experienced by several people
on the team.
Jing Yu [Thu, 25 Jun 2009 00:39:07 +0000 (17:39 -0700)]
Remove the installed headers that have been defined in Android tree.
Raphael Moll [Wed, 24 Jun 2009 22:45:46 +0000 (15:45 -0700)]
am
822cc7e5: Fix swt.jar for linux-x86_64.
Merge commit '
822cc7e5b40673176c5e1b9ab75f48d155d5c193'
* commit '
822cc7e5b40673176c5e1b9ab75f48d155d5c193':
Fix swt.jar for linux-x86_64.
Raphael Moll [Wed, 24 Jun 2009 00:28:04 +0000 (17:28 -0700)]
Fix swt.jar for linux-x86_64.
This moves prebuilt/linux-x86_64/swt into prebuilt/linux-x86/swt_64. The makefiles
always build using linux-x86 so the linux-x86_64 prebuild was never getting built
and it had no makefiles. Now the new prebuilt when invoked using linux-x86 generates
both out/.../swt.jar and out/.../swt_64.jar. This is then picked up by development.git
build/sdk-linux.atree to generate the correct final SDK files.
This depends on a CL from development.git:
http://android-git.corp.google.com/g/5179
Android (Google) Code Review [Mon, 22 Jun 2009 22:42:49 +0000 (15:42 -0700)]
am
71c7683a: Merge change 4893 into donut
Merge commit '
71c7683a425e396e2471a39468a353d08e7713be'
* commit '
71c7683a425e396e2471a39468a353d08e7713be':
Remove three header files that have been defined in Android tree.
Android (Google) Code Review [Mon, 22 Jun 2009 22:40:50 +0000 (15:40 -0700)]
Merge change 4893 into donut
* changes:
Remove three header files that have been defined in Android tree.
Jing Yu [Sun, 21 Jun 2009 06:24:07 +0000 (23:24 -0700)]
Remove three header files that have been defined in Android tree.
Doug Kwan [Thu, 18 Jun 2009 13:47:06 +0000 (06:47 -0700)]
Fix OSX hosted ARM tool-chain.
Jing Yu [Thu, 18 Jun 2009 03:35:40 +0000 (20:35 -0700)]
Rebuild the osx-based toolchain to support OSX10.4.
Dima Zavin [Mon, 15 Jun 2009 21:21:44 +0000 (14:21 -0700)]
am
b9ff3b86: Update prebuilt emulator kernel
Merge commit '
b9ff3b864846e0a3b56099b324a4c13649cbd569'
* commit '
b9ff3b864846e0a3b56099b324a4c13649cbd569':
Update prebuilt emulator kernel
Dima Zavin [Mon, 15 Jun 2009 21:01:27 +0000 (14:01 -0700)]
Update prebuilt emulator kernel
commit
b10edef14984cc56182d8014815a4e47518c2cdc
Merge:
a4ae495 7620ea5
Author: Dima Zavin <dima@android.com>
Date: Mon Jun 15 13:36:58 2009 -0700
Merge branch 'android-2.6.29' into android-goldfish-2.6.29
Conflicts:
drivers/misc/Kconfig
Jing Yu [Wed, 10 Jun 2009 22:45:42 +0000 (15:45 -0700)]
Add OSX hosted toolchain to prebuilt.
The toolchain was built with perforce2 gcc-4.4.0 @29689,
and binutils,gdb-6.6,gmp,mpfr from perforce9
android_toolchain @149396.
David 'Digit' Turner [Mon, 8 Jun 2009 16:37:56 +0000 (09:37 -0700)]
am
b1019449: Fix Linux build, the binaries must be generated with -fno-stack-protector or else bad thing happen at link time on some Linux distributions.
Merge commit '
b101944950cd53bf1b6352be998a44b9cb300abf'
* commit '
b101944950cd53bf1b6352be998a44b9cb300abf':
Fix Linux build, the binaries must be generated with -fno-stack-protector or else bad thing happen at link time on some Linux distributions.
David 'Digit' Turner [Mon, 8 Jun 2009 16:37:51 +0000 (09:37 -0700)]
am
7d324691: Add a new set of SDL prebuilt binaries. This patch is in preparation of another one that will move the sources of our SDL library to external/qemu At the moment, these sources still live on Perforce, which is bad..
Merge commit '
7d324691856f259ffa6edb674cf06dfadd54f9ca'
* commit '
7d324691856f259ffa6edb674cf06dfadd54f9ca':
Add a new set of SDL prebuilt binaries.
David 'Digit' Turner [Mon, 8 Jun 2009 15:27:45 +0000 (17:27 +0200)]
Fix Linux build, the binaries must be generated with -fno-stack-protector or else bad thing happen at link time on some Linux distributions.
David 'Digit' Turner [Thu, 4 Jun 2009 15:12:01 +0000 (17:12 +0200)]
Add a new set of SDL prebuilt binaries.
This patch is in preparation of another one that will move the sources of our SDL library to external/qemu
At the moment, these sources still live on Perforce, which is bad..
Android (Google) Code Review [Fri, 5 Jun 2009 07:30:20 +0000 (00:30 -0700)]
am
271ca31d: Merge change 3225 into donut
Merge commit '
271ca31de1c0e6e84c358d6641a6829f04abe1b1'
* commit '
271ca31de1c0e6e84c358d6641a6829f04abe1b1':
Check in a new gcc-4.4.0 toolchain.
Xavier Ducrohet [Fri, 5 Jun 2009 06:47:59 +0000 (23:47 -0700)]
am
e46a60f8: Replace SWT 3.2 by 3.4 and add 64bit versions for linux and windows.
Merge commit '
e46a60f8443044dab89a74f1a33b6556a212db5c'
* commit '
e46a60f8443044dab89a74f1a33b6556a212db5c':
Replace SWT 3.2 by 3.4 and add 64bit versions for linux and windows.
Android (Google) Code Review [Fri, 5 Jun 2009 05:11:36 +0000 (22:11 -0700)]
Merge change 3225 into donut
* changes:
Check in a new gcc-4.4.0 toolchain.
Jing Yu [Thu, 4 Jun 2009 21:03:39 +0000 (14:03 -0700)]
Check in a new gcc-4.4.0 toolchain.
gcc from google_vendor_src_branch @29689
binutils, gdb, gmp, mpfr from android-toolchain @149396
This 32bit toolchain is built on gDapper.
Xavier Ducrohet [Wed, 3 Jun 2009 23:09:07 +0000 (16:09 -0700)]
Replace SWT 3.2 by 3.4 and add 64bit versions for linux and windows.
Jing Yu [Wed, 3 Jun 2009 23:08:46 +0000 (16:08 -0700)]
am
03914241: Revert "Check in a new gcc-4.4.0 toolchain."
Merge commit '
0391424164c9a01951a50cf611aa974d396d7818'
* commit '
0391424164c9a01951a50cf611aa974d396d7818':
Revert "Check in a new gcc-4.4.0 toolchain."
Jing Yu [Wed, 3 Jun 2009 22:59:33 +0000 (15:59 -0700)]
Revert "Check in a new gcc-4.4.0 toolchain."
This reverts commit
4798997b8238dfe357cacb23e8be835d4f4d4b41.
The new toolchain breaks the build server because the new toolchain
was built on gHardy and is not compatible with gDapper.
Have to roll back.
Jing Yu [Wed, 3 Jun 2009 21:19:08 +0000 (14:19 -0700)]
am
4798997b: Check in a new gcc-4.4.0 toolchain.
Merge commit '
4798997b8238dfe357cacb23e8be835d4f4d4b41'
* commit '
4798997b8238dfe357cacb23e8be835d4f4d4b41':
Check in a new gcc-4.4.0 toolchain.
Jing Yu [Wed, 3 Jun 2009 18:11:52 +0000 (11:11 -0700)]
Check in a new gcc-4.4.0 toolchain.
gcc from google_vendor_src_branch @29689,
binutils, gdb, gmp, mpfr from android-toolchain @149396
This 32bit toolchain is built on gHardy.
Mike Lockwood [Tue, 2 Jun 2009 18:29:36 +0000 (11:29 -0700)]
am
7f2e2026: Roll back to previous emulator kernel to fix problems with adb.
Merge commit '
7f2e20260d94c50958028e0b5aa84bc5b8106501'
* commit '
7f2e20260d94c50958028e0b5aa84bc5b8106501':
Roll back to previous emulator kernel to fix problems with adb.
Mike Lockwood [Tue, 2 Jun 2009 18:21:05 +0000 (11:21 -0700)]
Roll back to previous emulator kernel to fix problems with adb.
This reverts the following change:
New emulator kernel with Java method tracing.
a4ae495d19be896cd39fbdd7ea4a64fe1756916b [ARM] goldfish: Disable hotplug helper in defconfig.
6eacd9b677065d584a0d39ea5f1b6786ab639e47 Merge branch 'android-2.6.29' into android-goldfish-2.6.29
2309613958ee518f94f1a7ba900e08e604e06048 [ARM] goldfish: qemutrace: Add mmap support.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Thu, 7 May 2009 18:59:56 +0000 (11:59 -0700)]
am
16a07fb: Merge change 1123 into donut
Merge commit '
16a07fb652cb1d88f4d3368a6aa6e39bc24d32a6'
* commit '
16a07fb652cb1d88f4d3368a6aa6e39bc24d32a6':
Add prebuilt GCC-4.4 toolchain to android tree.
Android (Google) Code Review [Thu, 7 May 2009 18:59:11 +0000 (11:59 -0700)]
Merge change 1123 into donut
* changes:
Add prebuilt GCC-4.4 toolchain to android tree.
Jing Yu [Thu, 7 May 2009 06:01:28 +0000 (23:01 -0700)]
Add prebuilt GCC-4.4 toolchain to android tree.
Tested:
This new toolchain has passed gcc dejagnu test, passed
android puppetmaster test on cupcake_rel@147963, and
successfully built git_donut tree.
Android (Google) Code Review [Wed, 6 May 2009 23:38:21 +0000 (16:38 -0700)]
am
128c85e: Merge change 1111 into donut
Merge commit '
128c85e63b38386cf7357790bd30e3ad11d67119'
* commit '
128c85e63b38386cf7357790bd30e3ad11d67119':
New emulator kernel with Java method tracing.
Android (Google) Code Review [Wed, 6 May 2009 23:37:47 +0000 (16:37 -0700)]
Merge change 1111 into donut
* changes:
New emulator kernel with Java method tracing.
Jack Veenstra [Wed, 6 May 2009 23:11:34 +0000 (16:11 -0700)]
New emulator kernel with Java method tracing.
a4ae495d19be896cd39fbdd7ea4a64fe1756916b [ARM] goldfish: Disable hotplug helper in defconfig.
6eacd9b677065d584a0d39ea5f1b6786ab639e47 Merge branch 'android-2.6.29' into android-goldfish-2.6.29
2309613958ee518f94f1a7ba900e08e604e06048 [ARM] goldfish: qemutrace: Add mmap support.
Jean-Michel Trivi [Wed, 29 Apr 2009 22:17:33 +0000 (15:17 -0700)]
am
02861b6: am
0a42a53: AI 147497: Replace Windows JetCreator native lib
Merge commit '
02861b6f0222bdbf8ecc9d036737370a713b67ce'
* commit '
02861b6f0222bdbf8ecc9d036737370a713b67ce':
AI 147497: Replace Windows JetCreator native library with one that works.
Jean-Michel Trivi [Wed, 29 Apr 2009 04:59:47 +0000 (21:59 -0700)]
am
0a42a53: AI 147497: Replace Windows JetCreator native library with on
Merge commit '
0a42a5353c7ccdc510e5cc094475578c62343c18' into donut
* commit '
0a42a5353c7ccdc510e5cc094475578c62343c18':
AI 147497: Replace Windows JetCreator native library with one that works.
The Android Open Source Project [Fri, 24 Apr 2009 20:55:03 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
Jean-Michel Trivi [Thu, 23 Apr 2009 19:21:18 +0000 (12:21 -0700)]
AI 147497: Replace Windows JetCreator native library with one that works.
BUG=
1721874
Automated import of CL 147497
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:20 +0000 (18:33 -0700)]
Merge donut into master