OSDN Git Service
The Android Automerger [Tue, 5 Jul 2011 13:44:01 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 4 Jul 2011 13:48:21 +0000 (06:48 -0700)]
IRK04
Change-Id: I5b1344966caf96375f99889108ab1431e4de5268
The Android Automerger [Mon, 4 Jul 2011 13:47:53 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
Eino-Ville Talvala [Wed, 29 Jun 2011 17:03:19 +0000 (10:03 -0700)]
Add mobile filter framework java library to core target files.
Change-Id: Ia4892d8c49be905ec68423224ca44c8558edbdb8
The Android Automerger [Fri, 1 Jul 2011 16:51:11 +0000 (09:51 -0700)]
IRJ91D
Change-Id: If04bf69185523a44c48187b4cae5de9d1d84960d
Mike Lockwood [Fri, 1 Jul 2011 16:31:47 +0000 (12:31 -0400)]
Remove obsolete persist.service.adb.enable property from default.prop
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Automerger [Fri, 1 Jul 2011 04:40:59 +0000 (21:40 -0700)]
IRJ91C
Change-Id: Ic509b00890d09f2e8984a04a6c3c562d0c9f2e8f
The Android Automerger [Thu, 30 Jun 2011 23:24:05 +0000 (16:24 -0700)]
IRJ91B
Change-Id: Iba64fa1e0013660cb72b0dc6b80537baadf7580d
The Android Automerger [Thu, 30 Jun 2011 13:44:35 +0000 (06:44 -0700)]
IRJ91
Change-Id: I1b7a83362578dd17eaa50883a314f20fe8548749
The Android Automerger [Thu, 30 Jun 2011 13:44:17 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 29 Jun 2011 23:29:36 +0000 (16:29 -0700)]
IRJ90B
Change-Id: I9942b4d7a0d036c4e1db297d1e61ea145a80da1d
The Android Automerger [Wed, 29 Jun 2011 13:46:32 +0000 (06:46 -0700)]
IRJ90
Change-Id: I3aae6e03976b642bb38356b72f14f56699d13ae9
The Android Automerger [Wed, 29 Jun 2011 13:46:26 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 28 Jun 2011 20:51:32 +0000 (13:51 -0700)]
IRJ89B
Change-Id: Ie5c6c6a60763b4002d65c45bdd18fb3b0e195403
The Android Automerger [Tue, 28 Jun 2011 13:44:44 +0000 (06:44 -0700)]
IRJ89
Change-Id: Ib10522e07dafa39a8ba14997815050ca9378b115
The Android Automerger [Tue, 28 Jun 2011 13:44:28 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
Evgeniy Stepanov [Tue, 21 Jun 2011 13:08:49 +0000 (17:08 +0400)]
Add .gnu_debuglink when stripping DSOs.
This is used by debug tools to find symbols for the stripped binary.
Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the
system image.
This change only affects -eng and -userdebug builds, and does not affect -user.
Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe
The Android Open Source Project [Mon, 27 Jun 2011 23:04:37 +0000 (16:04 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I6592f9416213bdf7c4190297b2edf08a5de9ce45
The Android Automerger [Mon, 27 Jun 2011 21:25:17 +0000 (14:25 -0700)]
IRJ88B
Change-Id: Ifc0122c6a9434d78c69745c864ae068f7a32a375
The Android Automerger [Mon, 27 Jun 2011 21:25:03 +0000 (14:25 -0700)]
merge in ics-release history after reset to master
David 'Digit' Turner [Mon, 27 Jun 2011 21:14:33 +0000 (14:14 -0700)]
am
11e1d5fb: am
6236d356: am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
11e1d5fb3a33de9c5aad7c21294b8019a0f042b8':
sdk: provide ABI-dependent atree files
The Android Automerger [Mon, 27 Jun 2011 15:17:16 +0000 (08:17 -0700)]
HLJ88
Change-Id: I886289d92b6850bd83c86cd48e182025ab137a0c
The Android Automerger [Mon, 27 Jun 2011 15:17:08 +0000 (08:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 27 Jun 2011 13:51:32 +0000 (06:51 -0700)]
IRJ88
Change-Id: I3dcaa0420059e0aefcefb6e94a90d65714b91356
The Android Automerger [Mon, 27 Jun 2011 13:51:10 +0000 (06:51 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Sat, 25 Jun 2011 18:49:31 +0000 (11:49 -0700)]
HLJ86
Change-Id: Ie9edd591b670684c633cabe2c475e7fcccb69e04
The Android Automerger [Sat, 25 Jun 2011 18:49:26 +0000 (11:49 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 25 Jun 2011 00:20:42 +0000 (17:20 -0700)]
HTJ85
Change-Id: Id7699e3bfdbc8a67d12f321a996e8eaa23e335ad
The Android Automerger [Sat, 25 Jun 2011 00:20:33 +0000 (17:20 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 24 Jun 2011 22:56:12 +0000 (15:56 -0700)]
IRJ85C
Change-Id: I67871bd5888cad1f4893987710c81c69413d0993
The Android Automerger [Fri, 24 Jun 2011 21:22:57 +0000 (14:22 -0700)]
IRJ85B
Change-Id: I11395c98577cdf7eb43b48c88166b1a84fedf2d3
The Android Automerger [Fri, 24 Jun 2011 21:22:54 +0000 (14:22 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 24 Jun 2011 20:30:46 +0000 (13:30 -0700)]
IRJ85
Change-Id: I67774f7143ab8f6651fe373f83ec256285699534
The Android Automerger [Fri, 24 Jun 2011 20:30:37 +0000 (13:30 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Fri, 24 Jun 2011 20:05:56 +0000 (13:05 -0700)]
Update to IRJ84C
Change-Id: I1961d6a9d61eeb04337323283db0bf199aa2af8f
android-merger [Fri, 24 Jun 2011 18:18:22 +0000 (11:18 -0700)]
GRJ85
Change-Id: I5f70ae7fcc5f1ff98c050d9e1a3a819fc2acbbfa
Jean-Baptiste Queru [Fri, 24 Jun 2011 15:48:31 +0000 (08:48 -0700)]
Revert "resolved conflicts for merge of
972433bd to master"
This reverts commit
5d0ec1aebb952601d98c2dad70ef369f75f2b44a, reversing
changes made to
4839e47309ccefc41d4e7055f701104995472723.
The Android Open Source Project [Fri, 24 Jun 2011 15:13:19 +0000 (08:13 -0700)]
Reconcile with honeycomb-mr1-release
Change-Id: I200a7f476eaefab1044101fa5d4ab022c332f159
The Android Open Source Project [Fri, 24 Jun 2011 15:08:33 +0000 (08:08 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I07d4e3193af523ef98d93716d0ec9419b138792a
The Android Automerger [Fri, 24 Jun 2011 14:20:06 +0000 (07:20 -0700)]
HLJ85
Change-Id: I30986e03b57683a77656b412683d448dfa725f79
The Android Automerger [Fri, 24 Jun 2011 14:19:57 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
David 'Digit' Turner [Fri, 24 Jun 2011 11:45:26 +0000 (13:45 +0200)]
resolved conflicts for merge of
972433bd to master
Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f
The Android Automerger [Thu, 23 Jun 2011 22:34:04 +0000 (15:34 -0700)]
IRJ84B
Change-Id: I3372a8a2a19c3fd50648f00a5a0464631ae956e6
Raphael [Thu, 23 Jun 2011 21:31:21 +0000 (14:31 -0700)]
am
2ec35cc8: am
4aed6434: am
0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '
2ec35cc88f10bcd11d3a193d58a1ab245caebce5':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
David 'Digit' Turner [Thu, 23 Jun 2011 21:29:59 +0000 (14:29 -0700)]
am
a85ebfb0: am
fa112f98: am
c134712f: am
04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit '
a85ebfb059080865a549539a9d2758c4e8b8aeed':
Turn-off implicit GNU Make RC/SCCS rules
Raphael [Thu, 23 Jun 2011 20:52:29 +0000 (13:52 -0700)]
resolved conflicts for merge of
732936d9 to master
Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c
David 'Digit' Turner [Thu, 23 Jun 2011 20:13:20 +0000 (13:13 -0700)]
am
6236d356: am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
6236d356a01150bc517bd639398df704735cc0fc':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 20:08:35 +0000 (13:08 -0700)]
am
b92c7a2c: am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 19:54:41 +0000 (12:54 -0700)]
am
cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '
cac8e55714424d385da5b40e5952dc539e510454':
sdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 19:18:49 +0000 (12:18 -0700)]
Merge "sdk: provide ABI-dependent atree files"
Raphael Moll [Thu, 23 Jun 2011 15:16:38 +0000 (08:16 -0700)]
am
de50d0ab: am
d6605405: am
7f5a314a: am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
de50d0ab2008cbf836dc4fcbe9131a2071265946':
Envsetup: Cygwin doesn't have 'ps -o command'.
The Android Open Source Project [Thu, 23 Jun 2011 14:27:04 +0000 (07:27 -0700)]
Reconcile with gingerbread-release
Change-Id: I52a808eebd1d2ca2711fe13f92ffc71c5ff7ab0a
The Android Automerger [Thu, 23 Jun 2011 14:19:19 +0000 (07:19 -0700)]
HLJ84
Change-Id: I124e43579c8be456a16036a5e709a5cc6ffa11a6
The Android Automerger [Thu, 23 Jun 2011 14:19:13 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 23 Jun 2011 13:44:58 +0000 (06:44 -0700)]
IRJ84
Change-Id: I2cb2fba949a04096da34cfc83f3452d07585e474
The Android Automerger [Thu, 23 Jun 2011 13:44:44 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
David 'Digit' Turner [Thu, 23 Jun 2011 12:28:08 +0000 (05:28 -0700)]
am
18447019: am
4b227c70: am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
1844701942de578bab6c7f17e14ef695bb8ed7c1':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 12:07:30 +0000 (05:07 -0700)]
am
4b227c70: am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
4b227c708c1014bd773085ae275275744f239435':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 11:49:56 +0000 (04:49 -0700)]
am
f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '
f9f83ed19e83313ffaf542b148886bcb860ca12e':
emulator: Enable dex-preoptimization
David 'Digit' Turner [Thu, 23 Jun 2011 11:24:50 +0000 (04:24 -0700)]
Merge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 10:49:02 +0000 (12:49 +0200)]
sdk: provide ABI-dependent atree files
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: Icdca751852c01421fccf196436a9bc1114ea90f7
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
Ying Wang [Wed, 22 Jun 2011 23:37:12 +0000 (16:37 -0700)]
Merge "Use the host STL for host native test."
The Android Automerger [Wed, 22 Jun 2011 23:35:15 +0000 (16:35 -0700)]
HTJ83
Change-Id: I8d46ec9b2e924a31ea8b4f41c3371c6675c3b5d3
The Android Automerger [Wed, 22 Jun 2011 23:34:28 +0000 (16:34 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 22 Jun 2011 23:27:32 +0000 (16:27 -0700)]
IRJ83B
Change-Id: I312f1d472f2f81c4d2cab1757ea6af393cb731d2
Ying Wang [Wed, 22 Jun 2011 23:01:48 +0000 (16:01 -0700)]
Use the host STL for host native test.
Bug:
4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88
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, 15 Jun 2011 23:32:20 +0000 (01:32 +0200)]
emulator: Enable dex-preoptimization
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: I67a9ce9791220c202817864c6e83dc8fd9cbc027
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'."
The Android Automerger [Wed, 22 Jun 2011 14:21:19 +0000 (07:21 -0700)]
HLJ83
Change-Id: Ic316d9029dc96afc24c2622063656d849a4fcad8
The Android Automerger [Wed, 22 Jun 2011 14:21:14 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 22 Jun 2011 13:48:53 +0000 (06:48 -0700)]
IRJ83
Change-Id: I22594d1c9a8803af8df14736b9d18e5835d7b023
The Android Automerger [Wed, 22 Jun 2011 13:48:39 +0000 (06:48 -0700)]
merge in ics-release history after reset to master
Brett Chabot [Wed, 22 Jun 2011 05:25:01 +0000 (22:25 -0700)]
Revert mistakenly committed debug statement.
Change-Id: Iee6369002ba984821c889c7c0a92db061dc21355
The Android Automerger [Wed, 22 Jun 2011 03:06:48 +0000 (20:06 -0700)]
HTJ82B
Change-Id: Ice0a2f97d729260b3b85842ebcd1183ca12ed06e
The Android Automerger [Wed, 22 Jun 2011 03:06:44 +0000 (20:06 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 22 Jun 2011 02:17:48 +0000 (19:17 -0700)]
HMJ82
Change-Id: I54f6cb71926b9808fbad655e0ba79bf4c8225217
The Android Automerger [Tue, 21 Jun 2011 23:04:37 +0000 (16:04 -0700)]
HTJ82
Change-Id: I91c10698321d2bada7e23c0dc28f99ce13d5cc02
The Android Automerger [Tue, 21 Jun 2011 23:04:33 +0000 (16:04 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
David 'Digit' Turner [Tue, 21 Jun 2011 22:27:10 +0000 (15:27 -0700)]
am
1c5df439: am
4f9479bf: am
683e8e17: am
04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '
1c5df4396b581df771212ffad891e970702f97c9':
emulator: Build emulator platform images as ARMv7-A
Jean-Baptiste Queru [Tue, 21 Jun 2011 22:24:48 +0000 (15:24 -0700)]
am
2feecf6f: am
cc7dccc8: (-s ours) am
91ba5de8: am
1894085d: Merge "Tweak prelink map even more"
* commit '
2feecf6f379438c2e8ebc4c270ad9e4d62f6c37c':
Tweak prelink map even more
The Android Automerger [Tue, 21 Jun 2011 21:41:17 +0000 (14:41 -0700)]
IRJ82B
Change-Id: Ic9c2334ededc6c4f8a81d2d9721939772226f5cf
Jean-Baptiste Queru [Tue, 21 Jun 2011 20:45:43 +0000 (13:45 -0700)]
am
2a85de6d: am
ea54b50e: am
f3659c8b: am
36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '
2a85de6d44c2969f1093486ad09ea94098dc8577':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Tue, 21 Jun 2011 20:45:36 +0000 (13:45 -0700)]
am
4a9dd2dc: am
af1b618c: (-s ours) am
c5e5d989: am
9d7590b9: Merge "Tweak prelink map"
* commit '
4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871':
Tweak prelink map
Brett Chabot [Tue, 21 Jun 2011 18:27:24 +0000 (11:27 -0700)]
Merge "Add layoutlib-tests to sdk build."
android-merger [Tue, 21 Jun 2011 17:37:59 +0000 (10:37 -0700)]
GRJ82
Change-Id: If9df26a746f9a2236e1234afd06dcbf0782f4dd0
OSDN Git Service
