OSDN Git Service
Raphael [Thu, 23 Jun 2011 02:10:23 +0000 (19:10 -0700)]
am
4aed6434: am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
4aed64341c6cff484c9b78fed3d13131049858c9':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
Raphael [Thu, 23 Jun 2011 02:05:16 +0000 (19:05 -0700)]
am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
0b6ece9dafcf6f06dd4418829434cdc4376375a3':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
David 'Digit' Turner [Thu, 23 Jun 2011 01:05:06 +0000 (18:05 -0700)]
am
fa112f98: am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
fa112f982241fc3efa0129094e87a34f2317f41e':
Turn-off implicit GNU Make RC/SCCS rules
Raphael [Fri, 27 May 2011 21:02:31 +0000 (14:02 -0700)]
SDK: properly strip all SDK llvm-rs-cc linux binaries.
Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f
David 'Digit' Turner [Wed, 22 Jun 2011 22:53:31 +0000 (15:53 -0700)]
am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
c134712ffa9e6617df46334a6293ddd80e05cf98':
Turn-off implicit GNU Make RC/SCCS rules
David 'Digit' Turner [Wed, 22 Jun 2011 22:28:56 +0000 (15:28 -0700)]
am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
04b49109710f74c59fb65b09b2028e5de7901f67':
Turn-off implicit GNU Make RC/SCCS rules
David 'Digit' Turner [Wed, 22 Jun 2011 21:40:52 +0000 (14:40 -0700)]
Merge "Turn-off implicit GNU Make RC/SCCS rules"
Raphael [Wed, 22 Jun 2011 21:35:32 +0000 (14:35 -0700)]
resolved conflicts for merge of
8508a073 to honeycomb-plus-aosp
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
David 'Digit' Turner [Wed, 22 Jun 2011 21:18:57 +0000 (23:18 +0200)]
Turn-off implicit GNU Make RC/SCCS rules
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.
Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
Raphael Moll [Wed, 22 Jun 2011 17:44:52 +0000 (10:44 -0700)]
am
d6605405: am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
d66054056311a369a090cd1aae2557454fdc7ecc':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:40:08 +0000 (10:40 -0700)]
am
6e65ddb2: am
cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
* commit '
6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
Lunch: don't use a toolchain that doesn't exist.
Raphael Moll [Wed, 22 Jun 2011 17:40:01 +0000 (10:40 -0700)]
am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:35:22 +0000 (10:35 -0700)]
am
cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
* commit '
cb84196f3ae966b2a4a0d16f0cc314a855b6dad6':
Lunch: don't use a toolchain that doesn't exist.
Raphael Moll [Wed, 22 Jun 2011 17:35:20 +0000 (10:35 -0700)]
am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
169c19ccb566d72a8ea142afb2550f9c54c5fea9':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:18:20 +0000 (10:18 -0700)]
Merge "Lunch: don't use a toolchain that doesn't exist."
Raphael Moll [Wed, 22 Jun 2011 17:17:02 +0000 (10:17 -0700)]
Merge "Envsetup: Cygwin doesn't have 'ps -o command'."
Raphael Moll [Tue, 21 Jun 2011 00:25:01 +0000 (17:25 -0700)]
Lunch: don't use a toolchain that doesn't exist.
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.
Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
Raphael Moll [Mon, 20 Jun 2011 23:03:14 +0000 (16:03 -0700)]
Envsetup: Cygwin doesn't have 'ps -o command'.
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.
Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
David 'Digit' Turner [Mon, 20 Jun 2011 16:10:58 +0000 (09:10 -0700)]
am
4f9479bf: am
683e8e17: am
04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '
4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8':
emulator: Build emulator platform images as ARMv7-A
David 'Digit' Turner [Mon, 20 Jun 2011 16:04:39 +0000 (09:04 -0700)]
am
683e8e17: am
04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '
683e8e17f7c20b54da74c05b3a044f46d4b3bddf':
emulator: Build emulator platform images as ARMv7-A
David 'Digit' Turner [Mon, 20 Jun 2011 15:47:29 +0000 (08:47 -0700)]
am
04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '
04b963a1c037a7e9e8b5fb46603e009965293d9d':
emulator: Build emulator platform images as ARMv7-A
David 'Digit' Turner [Mon, 20 Jun 2011 13:56:36 +0000 (06:56 -0700)]
Merge "emulator: Build emulator platform images as ARMv7-A"
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:22:44 +0000 (14:22 -0700)]
am
cc7dccc8: (-s ours) am
91ba5de8: am
1894085d: Merge "Tweak prelink map even more"
* commit '
cc7dccc815cfd6c29e934f038cd0a0b9d8f51a6a':
Tweak prelink map even more
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:12:30 +0000 (14:12 -0700)]
am
91ba5de8: am
1894085d: Merge "Tweak prelink map even more"
* commit '
91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
Tweak prelink map even more
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:08:22 +0000 (14:08 -0700)]
am
1894085d: Merge "Tweak prelink map even more"
* commit '
1894085d6e765878a928d901d1c91b16f9616d96':
Tweak prelink map even more
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:50:05 +0000 (13:50 -0700)]
Merge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:20:32 +0000 (13:20 -0700)]
Tweak prelink map even more
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:46:31 +0000 (12:46 -0700)]
am
ea54b50e: am
f3659c8b: am
36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '
ea54b50e560d911f3b7efd2638cf1f56afdd834d':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:46:29 +0000 (12:46 -0700)]
am
af1b618c: (-s ours) am
c5e5d989: am
9d7590b9: Merge "Tweak prelink map"
* commit '
af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:23:21 +0000 (12:23 -0700)]
am
f3659c8b: am
36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '
f3659c8b0a1cf60d5bcd28d8a1c0e39716f4060f':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:21:37 +0000 (12:21 -0700)]
am
c5e5d989: am
9d7590b9: Merge "Tweak prelink map"
* commit '
c5e5d9897f6fc18123a8f5d15a90152019979a22':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:02:44 +0000 (12:02 -0700)]
am
36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '
36c1f10dee646935d73106a01b1d50628b9a2dcb':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:59:32 +0000 (11:59 -0700)]
am
9d7590b9: Merge "Tweak prelink map"
* commit '
9d7590b93ff549cf8a4b432932fa68799166ed79':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:19:14 +0000 (11:19 -0700)]
Merge "Relax the constraint of 64bit build environment."
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:36 +0000 (11:15 -0700)]
Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:00 +0000 (11:15 -0700)]
Tweak prelink map
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:24:53 +0000 (08:24 -0700)]
am
5e2e09c5: (-s ours) am
ee803184: am
f771489d: Merge "Tweak prelink map, more"
* commit '
5e2e09c569092dcc19f9646060cc1c33266eb213':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:04:31 +0000 (08:04 -0700)]
am
ee803184: am
f771489d: Merge "Tweak prelink map, more"
* commit '
ee8031843e4dc3e9ff60c1acdc516121145fece1':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:57:22 +0000 (07:57 -0700)]
am
f771489d: Merge "Tweak prelink map, more"
* commit '
f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:43:02 +0000 (07:43 -0700)]
Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:33:52 +0000 (07:33 -0700)]
Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:29:36 +0000 (20:29 -0700)]
am
84891367: am
9bd85361: am
15ced7e1: Merge prelink map tweaks
* commit '
8489136766b282d95f6e447a5ff4d63fbdbe8409':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:25:43 +0000 (20:25 -0700)]
am
9bd85361: am
15ced7e1: Merge prelink map tweaks
* commit '
9bd853612a45753512b3dab27f247adb46e7a3c8':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:22:36 +0000 (20:22 -0700)]
am
15ced7e1: Merge prelink map tweaks
* commit '
15ced7e137017befbae5bdde3b7ff60a27d897d4':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:17:28 +0000 (20:17 -0700)]
Merge prelink map tweaks
Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 02:03:52 +0000 (19:03 -0700)]
am
9f2e07d2: am
69ae44e2: am
fd64de9a: Merge prelink map tweaks
* commit '
9f2e07d2c2147572edb7170206ba7ece6d42fcb5':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:58:18 +0000 (18:58 -0700)]
am
69ae44e2: am
fd64de9a: Merge prelink map tweaks
* commit '
69ae44e284b1735928b8db53bf2e0690768e2d1b':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:52:34 +0000 (18:52 -0700)]
am
fd64de9a: Merge prelink map tweaks
* commit '
fd64de9ae410b6bfe024971bd543d42286d2990f':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:37:07 +0000 (18:37 -0700)]
Merge prelink map tweaks
Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:50:29 +0000 (17:50 -0700)]
am
2ba042f9: (-s ours) am
40dc95be: am
14273125: Merge "Tweak prelink map"
* commit '
2ba042f9d86c7715cbca07e0fd417d8cf9496846':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:32:11 +0000 (17:32 -0700)]
am
40dc95be: am
14273125: Merge "Tweak prelink map"
* commit '
40dc95be7744871b5363ae2e21a14343cd666b0f':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:09:14 +0000 (17:09 -0700)]
am
14273125: Merge "Tweak prelink map"
* commit '
142731256afc708f4ec07247bffbe733dcaed0f4':
Tweak prelink map
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:31:58 +0000 (16:31 -0700)]
Merge "Tweak prelink map"
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:17:42 +0000 (16:17 -0700)]
Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:12:18 +0000 (14:12 -0700)]
am
70a89584: Merge
742968bd
* commit '
70a895846d9a9fdddd9d224e32959a53f9d3c97e':
Adding a cleanspec to pick up version change. Do not merge.
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:06:55 +0000 (14:06 -0700)]
Merge
742968bd
Change-Id: I90a9f487a8b6d9bc96dedbe9f1e978e439be8cd3
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.
Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61
Ed Heyl [Thu, 16 Jun 2011 20:19:42 +0000 (13:19 -0700)]
am
cedbd2f5: (-s ours) am
eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit '
cedbd2f587f894647ab5bf3bdd200ee78c673881':
add ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Thu, 16 Jun 2011 20:17:08 +0000 (13:17 -0700)]
am
eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit '
eb27aa01c87ed774cf5d71ce1c92d87575a08ad7':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Thu, 16 Jun 2011 20:09:12 +0000 (13:09 -0700)]
am
eb9fc27d: am
4c90a648: am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
eb9fc27dbe062248167981d2a4f1aa9e058a2313':
Switch back to mksh as the default
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:57:33 +0000 (12:57 -0700)]
am
4c90a648: am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
4c90a648cd0e1310d4b934c54905af3cf40b2770':
Switch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 18:39:18 +0000 (11:39 -0700)]
am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
Switch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 17:53:27 +0000 (10:53 -0700)]
Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 16:25:58 +0000 (09:25 -0700)]
Switch back to mksh as the default
Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:46:17 +0000 (07:46 -0700)]
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)]
Merge
bb41d06d
Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf
David 'Digit' Turner [Wed, 15 Jun 2011 13:33:24 +0000 (15:33 +0200)]
emulator: Build emulator platform images as ARMv7-A
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: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
Dianne Hackborn [Fri, 10 Jun 2011 14:29:22 +0000 (07:29 -0700)]
Merge
cb5b6d16
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
Dianne Hackborn [Fri, 10 Jun 2011 00:25:43 +0000 (17:25 -0700)]
am
0b22d93b: Welcome, Android 3.2.
* commit '
0b22d93be32eeff06e6626ad766b040057b931a5':
Welcome, Android 3.2.
Dianne Hackborn [Thu, 9 Jun 2011 18:29:34 +0000 (11:29 -0700)]
Welcome, Android 3.2.
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
Dan Morrill [Thu, 9 Jun 2011 20:20:55 +0000 (13:20 -0700)]
Update version to 2.3.5.
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
Ed Heyl [Tue, 7 Jun 2011 20:15:20 +0000 (13:15 -0700)]
am
ec664803: am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:11:14 +0000 (13:11 -0700)]
Merge
78e7f1f0
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:10:15 +0000 (13:10 -0700)]
Merge
5adc2d05
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:09:58 +0000 (13:09 -0700)]
Merge
c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
Ed Heyl [Tue, 7 Jun 2011 19:55:39 +0000 (12:55 -0700)]
am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
c811f29198fc4862e22dbf233bc28210d14e0205':
add ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
Ying Wang [Tue, 7 Jun 2011 00:29:49 +0000 (17:29 -0700)]
am
1482d2db: am
e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '
1482d2db83abaa7d9a01831bdaeb99d4a68fd68a':
Support to run dex-preopt on prebuilt apks.
David Turner [Mon, 6 Jun 2011 19:27:26 +0000 (12:27 -0700)]
am
c1705c9a: Merge "x86: Enable -fstack-protector"
* commit '
c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
x86: Enable -fstack-protector
David Turner [Mon, 6 Jun 2011 18:33:04 +0000 (11:33 -0700)]
am
4272b32a: Merge "Clean up of X86 build flags"
* commit '
4272b32a86bd22ce560e41816cece950a7af4e51':
Clean up of X86 build flags
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:23:09 +0000 (08:23 -0700)]
am
536938e0: am
978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '
536938e01195a2ee279a6652e0b88c50d5f4c2a8':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:19:48 +0000 (08:19 -0700)]
am
978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '
978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:12:31 +0000 (08:12 -0700)]
Merge "Increase the Java heap size for droiddoc"
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:26:18 +0000 (14:26 -0700)]
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:09:24 +0000 (14:09 -0700)]
Merge from gingerbread
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
Jean-Baptiste Queru [Wed, 1 Jun 2011 15:07:56 +0000 (08:07 -0700)]
am
3c60c67a: Merge from open-source gingerbread
* commit '
3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Wed, 1 Jun 2011 14:42:07 +0000 (07:42 -0700)]
Merge from open-source gingerbread
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread
Ying Wang [Fri, 27 May 2011 22:38:10 +0000 (15:38 -0700)]
am
3487736b: am
7d83ef8f: Support custom RenderScript compiler
* commit '
3487736bac5625bef8ff9bc4ef311b29348055d9':
Support custom RenderScript compiler
Ying Wang [Fri, 27 May 2011 22:35:48 +0000 (15:35 -0700)]
am
7d83ef8f: Support custom RenderScript compiler
* commit '
7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
Support custom RenderScript compiler
Ying Wang [Thu, 26 May 2011 00:16:22 +0000 (17:16 -0700)]
Support custom RenderScript compiler
Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
Scott Main [Fri, 27 May 2011 17:54:50 +0000 (10:54 -0700)]
am
e02449dc: am
44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '
e02449dc9f02459d077c99a72033c7653be634bb':
docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Scott Main [Fri, 27 May 2011 17:23:09 +0000 (10:23 -0700)]
am
44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '
44c32b95f50f1190955a07dfece801875894d0bf':
docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Scott Main [Fri, 27 May 2011 17:18:14 +0000 (10:18 -0700)]
Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 16:52:19 +0000 (09:52 -0700)]
docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14
OSDN Git Service
