OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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.
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
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:43 +0000 (17:12 -0700)]
Merge donut into master
Jean-Michel Trivi [Sun, 19 Apr 2009 04:35:30 +0000 (21:35 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Sun, 19 Apr 2009 04:34:12 +0000 (21:34 -0700)]
AI 146583: am: CL 146482 am: CL 146396 Add the PREBUILT file for the JetCreator library for the OS X build.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146583
Jean-Michel Trivi [Thu, 16 Apr 2009 19:35:33 +0000 (12:35 -0700)]
AI 146482: am: CL 146396 Add the PREBUILT file for the JetCreator library for the OS X build.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 146482
Jean-Michel Trivi [Thu, 16 Apr 2009 01:15:10 +0000 (18:15 -0700)]
AI 146396: Add the PREBUILT file for the JetCreator library for the OS X build.
BUG=
1721874
Automated import of CL 146396
Doug Kwan [Tue, 7 Apr 2009 01:49:49 +0000 (18:49 -0700)]
Merge branch 'readonly-p4-master'
Doug Kwan [Tue, 7 Apr 2009 01:48:19 +0000 (18:48 -0700)]
AI 144748: am: CL 144743 Refresh Linux and OSX hosted arm-eabi-4.3.1 tool-chain.
This CL refreshes the arm-eabi-4.3.1 tool-chains in donutburger.
The tool-chains were built at CL 144476. The Linux hosted tool-chain
was configured as:
../toolchain/android-toolchain/configure --target=arm-eabi \
--prefix=/disk2/dougkwan/android-3/arm-eabi-4.3.1 \
--with-sysroot=/disk2/dougkwan/android-3/arm-eabi-4.3.1/sysroot \
--with-gcc-version=4.3.1 --with-binutils-version=2.19
The sysroot was built from cupcake_rel branch at CL 143764. It was
only used while the tools where built and was not part of this check-in.
The OSX hosted tool-chain was configed as:
../toolchain/android-toolchain/configure --target=arm-eabi \
--prefix=/Volumes/android/mac-android-1/arm-eabi-4.3.1 \
--with-sysroot=/Volumes/android/mac-android-1/arm-eabi-4.3.1/sysroot \
--with-gcc-version=4.3.1 --with-binutils-version=2.19
The sysroot used was the same one as in the Linux hosted tools.
The CL was tested by building donutburger using new tool-chains on
both Linux and MacOS. The framework test-suite was run in emulator
on a Linux host. All tests passed. The gcc dejagnu C test-suite was
also run for both ARM and THUMB modes. There are about 100 unexpected
failures in both modes (<0.2%).
Original author: dougkwan
Automated import of CL 144748
Doug Kwan [Tue, 7 Apr 2009 01:46:38 +0000 (18:46 -0700)]
AI 144743: Refresh Linux and OSX hosted arm-eabi-4.3.1 tool-chain.
This CL refreshes the arm-eabi-4.3.1 tool-chains in donutburger.
The tool-chains were built at CL 144476. The Linux hosted tool-chain
was configured as:
../toolchain/android-toolchain/configure --target=arm-eabi \
--prefix=/disk2/dougkwan/android-3/arm-eabi-4.3.1 \
--with-sysroot=/disk2/dougkwan/android-3/arm-eabi-4.3.1/sysroot \
--with-gcc-version=4.3.1 --with-binutils-version=2.19
The sysroot was built from cupcake_rel branch at CL 143764. It was
only used while the tools where built and was not part of this check-in.
The OSX hosted tool-chain was configed as:
../toolchain/android-toolchain/configure --target=arm-eabi \
--prefix=/Volumes/android/mac-android-1/arm-eabi-4.3.1 \
--with-sysroot=/Volumes/android/mac-android-1/arm-eabi-4.3.1/sysroot \
--with-gcc-version=4.3.1 --with-binutils-version=2.19
The sysroot used was the same one as in the Linux hosted tools.
The CL was tested by building donutburger using new tool-chains on
both Linux and MacOS. The framework test-suite was run in emulator
on a Linux host. All tests passed. The gcc dejagnu C test-suite was
also run for both ARM and THUMB modes. There are about 100 unexpected
failures in both modes (<0.2%).
Automated import of CL 144743
Jean-Michel Trivi [Fri, 3 Apr 2009 23:32:32 +0000 (16:32 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Fri, 3 Apr 2009 23:31:17 +0000 (16:31 -0700)]
AI 144543: am: CL 144541 am: CL 144535 Checking in Sonivox' prebuilt libraries for JetCreator.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144543
Jean-Michel Trivi [Fri, 3 Apr 2009 23:30:27 +0000 (16:30 -0700)]
AI 144541: am: CL 144535 Checking in Sonivox' prebuilt libraries for JetCreator.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 144541
Jean-Michel Trivi [Fri, 3 Apr 2009 23:26:13 +0000 (16:26 -0700)]
AI 144535: Checking in Sonivox' prebuilt libraries for JetCreator.
BUG=
1721874
Automated import of CL 144535
The Android Open Source Project [Sun, 29 Mar 2009 15:55:15 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project [Fri, 27 Mar 2009 22:31:14 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Iliyan Malchev [Wed, 25 Mar 2009 03:02:31 +0000 (20:02 -0700)]
Automated import from //branches/donutburger/...@141318,141318
Iliyan Malchev [Wed, 25 Mar 2009 03:02:16 +0000 (20:02 -0700)]
Automated import from //branches/master/...@141320,141320
Jorg Pleumann [Wed, 25 Mar 2009 00:41:23 +0000 (17:41 -0700)]
Automated import from //branches/master/...@140437,140437
Jorg Pleumann [Wed, 25 Mar 2009 00:39:25 +0000 (17:39 -0700)]
Automated import from //branches/donutburger/...@140434,140434
The Android Open Source Project [Fri, 20 Mar 2009 06:08:57 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:51 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Fri, 13 Mar 2009 20:04:25 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:59 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Mon, 9 Mar 2009 18:52:15 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Thu, 5 Mar 2009 22:34:39 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:32:45 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:54 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Fri, 20 Feb 2009 15:38:34 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:36 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Tue, 10 Feb 2009 23:44:06 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:16:16 +0000 (00:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:45 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Sat, 10 Jan 2009 02:04:23 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:25 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
Jean-Baptiste Queru [Fri, 19 Dec 2008 15:55:52 +0000 (07:55 -0800)]
Merge commit 'remotes/korg/cupcake'
The Android Open Source Project [Thu, 18 Dec 2008 02:06:43 +0000 (18:06 -0800)]
Code drop from //branches/cupcake/...@124589
Dave Bort [Wed, 22 Oct 2008 00:37:07 +0000 (17:37 -0700)]
Add a file describing how to rebuild the emulator kernel
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution