OSDN Git Service
android-merger [Sun, 16 Jan 2011 23:32:48 +0000 (15:32 -0800)]
HRI16B
Change-Id: Ifa2679fe26537bef9755ad3191f1bfd83216fa1c
The Android Automerger [Sun, 16 Jan 2011 16:25:22 +0000 (08:25 -0800)]
HRI16
Change-Id: Ic8c95485fe2a5af86f8f400abb12659f8052a715
The Android Automerger [Sun, 16 Jan 2011 16:24:47 +0000 (08:24 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Fri, 14 Jan 2011 23:47:18 +0000 (15:47 -0800)]
HRI14B
Change-Id: If7622a03d8891f71a51ca99ec17d4960f3cdbbf8
The Android Automerger [Fri, 14 Jan 2011 15:23:03 +0000 (07:23 -0800)]
HRI14
Change-Id: Ib76f59b496671b7aff3fac02525750409ebad8f0
The Android Automerger [Fri, 14 Jan 2011 15:22:28 +0000 (07:22 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Fri, 14 Jan 2011 01:48:44 +0000 (17:48 -0800)]
HRI13C
Change-Id: I4e49bfcfe42aa554ab3ea2fc0d219e8ea1b14274
android-merger [Thu, 13 Jan 2011 23:18:19 +0000 (15:18 -0800)]
HRI13B
Change-Id: I4992a71569905b9a7f7fb8708949ecf78560e8cc
Raphael [Thu, 13 Jan 2011 18:30:19 +0000 (10:30 -0800)]
Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
The Android Automerger [Thu, 13 Jan 2011 15:22:04 +0000 (07:22 -0800)]
HRI13
Change-Id: I19d28a6f0e46e7f479ea413d8521e0504fc07f45
The Android Automerger [Thu, 13 Jan 2011 15:21:49 +0000 (07:21 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Thu, 13 Jan 2011 00:50:00 +0000 (16:50 -0800)]
docs: make only the expando link not-underlined
and wait until close animation is done before collapsing the toggle
Change-Id: Ie75f99a5cf5fcc2cbf33bb46a00ce79cd688ce5c
Scott Main [Wed, 12 Jan 2011 22:33:58 +0000 (14:33 -0800)]
docs: implement toggle features for documentation content.
There existed another form of this script and styles, but it was not used.
Change-Id: I5d3bf0b4f6b8159e8f837692e9b1613aae140e24
android-merger [Wed, 12 Jan 2011 22:20:20 +0000 (14:20 -0800)]
HRI12B
Change-Id: I417ae3f6a46f3814adcaaaa96ed36e0f3959194d
Raphael [Wed, 12 Jan 2011 21:33:04 +0000 (13:33 -0800)]
Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.
Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
$ USE_MINGW=1 make llvm-rs-cc
Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
The Android Automerger [Wed, 12 Jan 2011 15:43:15 +0000 (07:43 -0800)]
HRI12
Change-Id: I1782f76fe01a5b06c7f3edb69383b287821df75f
The Android Automerger [Wed, 12 Jan 2011 15:42:44 +0000 (07:42 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Tue, 11 Jan 2011 16:37:17 +0000 (08:37 -0800)]
HRI11B
Change-Id: I356c2212526820eafa4bdb58cf5f457caf0031b0
The Android Automerger [Tue, 11 Jan 2011 16:24:39 +0000 (08:24 -0800)]
HRI11
Change-Id: I6084e62968de88305afe9a925d80b8f2f67c01e6
The Android Automerger [Tue, 11 Jan 2011 16:24:33 +0000 (08:24 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Tue, 11 Jan 2011 15:26:17 +0000 (07:26 -0800)]
HRI11
Change-Id: I78cd6c33986886a0ee5af4d51818f41b7ebe583c
The Android Automerger [Tue, 11 Jan 2011 15:25:46 +0000 (07:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Tue, 11 Jan 2011 06:25:09 +0000 (22:25 -0800)]
HRI10C
Change-Id: Ifc41c4a6221f0a34209769e5f5f0aa2a5412823e
android-merger [Tue, 11 Jan 2011 01:41:05 +0000 (17:41 -0800)]
HRI10B
Change-Id: Ie219027403d5ccfb928449d8ad9965380de0f080
android-merger [Tue, 11 Jan 2011 00:43:04 +0000 (16:43 -0800)]
Merge remote branch 'goog/honeycomb-release' into honeycomb-release
android-merger [Mon, 10 Jan 2011 21:38:16 +0000 (13:38 -0800)]
HRI07D
Change-Id: I3fcae5adb4a8e66e23e860e9982ceb41529b18ac
The Android Automerger [Mon, 10 Jan 2011 15:58:23 +0000 (07:58 -0800)]
HRI10
Change-Id: I5d2adb59180653965d533b443c89eaae52d3e8cb
The Android Automerger [Mon, 10 Jan 2011 15:58:13 +0000 (07:58 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Sun, 9 Jan 2011 21:18:15 +0000 (13:18 -0800)]
HRI07C
Change-Id: I563a4fdcd54ed4dc72d2c2650d27a324bb050ca3
Dirk Dougherty [Sat, 8 Jan 2011 01:07:43 +0000 (17:07 -0800)]
Doc change: Remove redundant dir and image.
Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7
android-merger [Fri, 7 Jan 2011 23:42:53 +0000 (15:42 -0800)]
HRI07B
Change-Id: I3fd08c6d7bb0e6af5fea7c0efbabafb0d99746ac
android-merger [Fri, 7 Jan 2011 23:38:09 +0000 (15:38 -0800)]
merge (-s ours) history of HRI06B
Scott Main [Fri, 7 Jan 2011 20:08:09 +0000 (12:08 -0800)]
docs: catchup templates to non-merged changes from gingerbread,
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo
Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
android-merger [Fri, 7 Jan 2011 19:40:02 +0000 (11:40 -0800)]
HRI06B
Change-Id: Ic4efc3cbbf74be39476a921653485cad2128442c
The Android Automerger [Fri, 7 Jan 2011 15:46:18 +0000 (07:46 -0800)]
HRI07
Change-Id: I6a96066187181cf0f837a3e87dcb1ee52477bec5
The Android Automerger [Fri, 7 Jan 2011 15:45:49 +0000 (07:45 -0800)]
merge in honeycomb-release history after reset to honeycomb
Dianne Hackborn [Thu, 6 Jan 2011 20:47:43 +0000 (12:47 -0800)]
We. Are. Honeycomb!
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
The Android Automerger [Thu, 6 Jan 2011 15:30:44 +0000 (07:30 -0800)]
HRI06
Change-Id: I6f543721e3e6c464ed2bdcb6f50be05295847962
The Android Automerger [Thu, 6 Jan 2011 15:30:08 +0000 (07:30 -0800)]
merge in honeycomb-release history after reset to honeycomb
Raphael Moll [Wed, 5 Jan 2011 23:50:22 +0000 (15:50 -0800)]
am
e503fcd5: am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:48:24 +0000 (15:48 -0800)]
am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:35:24 +0000 (15:35 -0800)]
Merge "Pass OUT_DIR variable to atree."
Raphael Moll [Wed, 5 Jan 2011 22:58:17 +0000 (14:58 -0800)]
Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
Jason parks [Wed, 5 Jan 2011 21:14:49 +0000 (13:14 -0800)]
Merge "Add the CryptKeeper to the build."
Jason parks [Wed, 5 Jan 2011 20:51:42 +0000 (14:51 -0600)]
Add the CryptKeeper to the build.
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
android-merger [Wed, 5 Jan 2011 20:09:33 +0000 (12:09 -0800)]
HRI05B
Change-Id: I851f5b61575c8c8a435d55376351fdf47f604e89
The Android Automerger [Wed, 5 Jan 2011 20:01:53 +0000 (12:01 -0800)]
HRI05
Change-Id: I7bc7046597cc3b1a16f15d45f6b673ce19e180c9
The Android Automerger [Wed, 5 Jan 2011 20:01:41 +0000 (12:01 -0800)]
merge in honeycomb-release history after reset to master
Jing Yu [Wed, 5 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Remove global inline options."
The Android Automerger [Wed, 5 Jan 2011 15:26:34 +0000 (07:26 -0800)]
HRI05
Change-Id: Ie6430a6eac950e7f9fea7fc6a31b1e77e42c9a9d
The Android Automerger [Wed, 5 Jan 2011 15:26:23 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to master
Sriram Raman [Wed, 5 Jan 2011 02:09:47 +0000 (21:09 -0500)]
HRI04B
Change-Id: I0ff399e8d64c8ad923cb3e10bb9d45978009a7a5
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug:
3321625
Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
Jeff Brown [Wed, 5 Jan 2011 01:30:46 +0000 (17:30 -0800)]
Merge "Add libinput to prelink map."
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug:
3321625
Change-Id: I87667355aa03f31613a8f6a5e17d7e469bf5335f
Jeff Brown [Wed, 5 Jan 2011 00:01:15 +0000 (16:01 -0800)]
Add libinput to prelink map.
Change-Id: I26998d4799d26165b3f528d1cd292b212eaaab9d
The Android Automerger [Tue, 4 Jan 2011 15:31:48 +0000 (07:31 -0800)]
HRI04
Change-Id: Ie1c6078fe96412e5c2e15cb09936e1c96c3d3bf0
The Android Automerger [Tue, 4 Jan 2011 15:31:30 +0000 (07:31 -0800)]
merge in honeycomb-release history after reset to master
android-merger [Thu, 30 Dec 2010 06:09:31 +0000 (22:09 -0800)]
HRH83E
Change-Id: I1242272122d7df04f8c005d017e0ccc6a76b3731
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:14 +0000 (16:02 -0800)]
am
41c423da: am
96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '
41c423da9df557b87e8db490b3ed4d4b34470423':
generic_x86 builds don't need/use the sparse ext4 format.
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:12 +0000 (16:02 -0800)]
am
827c662d: am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
827c662d8f145e5a0492838c951dad5d96716c71':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:09 +0000 (16:02 -0800)]
am
4bd05717: am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
4bd05717e2156a0eeb9de81de3e8595b560f2627':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:31:27 +0000 (14:31 -0800)]
Merge "Enhance product vars examining."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:01 +0000 (14:31 -0800)]
am
96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '
96d3e9b3108eb430a01cca41cb06baa1b8eb22ec':
generic_x86 builds don't need/use the sparse ext4 format.
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:00 +0000 (14:31 -0800)]
am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:30:58 +0000 (14:30 -0800)]
am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:07:38 +0000 (14:07 -0800)]
Enhance product vars examining.
Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:28 +0000 (14:17 -0800)]
Merge "generic_x86 builds don't need/use the sparse ext4 format."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:05 +0000 (14:17 -0800)]
Merge "Use ext4 file system for generic_x86 userdata partition"
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:10:17 +0000 (14:10 -0800)]
Merge "GB Updates for init.rc and boot command line"
Mike Lockwood [Wed, 29 Dec 2010 14:07:38 +0000 (09:07 -0500)]
Add libmtp and libusbhost to prelink map
Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ying Wang [Wed, 29 Dec 2010 00:40:01 +0000 (16:40 -0800)]
Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"
Bruce Beare [Tue, 28 Dec 2010 23:33:22 +0000 (15:33 -0800)]
generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 21:05:23 +0000 (13:05 -0800)]
Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 20:37:52 +0000 (12:37 -0800)]
GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:59:33 +0000 (13:59 -0800)]
am
54c5e5b1: am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
54c5e5b18be967a46fbee8769c392cbe0dfe7530':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:51:53 +0000 (13:51 -0800)]
am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:43:32 +0000 (13:43 -0800)]
Merge "Product-configurable sparse ext images."
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.
Change-Id: I79a6a71873634a231aa8990cee22374259601505
Ying Wang [Tue, 28 Dec 2010 21:14:29 +0000 (13:14 -0800)]
LOCAL_AAPT_INCLUDE_ALL_RESOURCES
Set this flag to include all the resources in the given dirs.
Bug:
3313179
Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
Sriram Raman [Mon, 27 Dec 2010 06:59:55 +0000 (01:59 -0500)]
HRH83D
Change-Id: I12d36a9e97b5deb1518c1245924910fae458c34d
android-merger [Fri, 24 Dec 2010 00:17:02 +0000 (16:17 -0800)]
HRH83C
Change-Id: I557924a9a8aa0c507d70979f322420de80f5673b
android-merger [Thu, 23 Dec 2010 19:23:22 +0000 (11:23 -0800)]
HRH83B
Change-Id: I1561e346d76053c7a03bccd6c263b1fce97c0ca4
android-merger [Thu, 23 Dec 2010 17:57:09 +0000 (09:57 -0800)]
HRH84
Change-Id: I1a4f121e8dcb7587a08035011c6e5cade2b5255d
The Android Automerger [Wed, 22 Dec 2010 16:09:04 +0000 (08:09 -0800)]
HRH83
Change-Id: Id76f61d135574f8196040d452f1793bf12b444cb
The Android Automerger [Wed, 22 Dec 2010 16:08:53 +0000 (08:08 -0800)]
merge in honeycomb-release history after reset to master
Jing Yu [Wed, 22 Dec 2010 00:33:48 +0000 (16:33 -0800)]
Remove global inline options.
The purpose of removing global inline options is to give
compiler the opportunity to do inline optimizations and inline
tunings for Android native codes.
By removing these global inline options now, the size of
almost all native libraries are reduced. And there is no
noticable performance degradation on webkit, gcstone and
skia benchmarks.
Change-Id: I31e71f51e4f29fa6286fddb89e9eab227581c7b3
Sriram Raman [Tue, 21 Dec 2010 23:56:02 +0000 (18:56 -0500)]
HRH82B
Change-Id: Ica63b0e91475f3e8a523a474c02713880c94a6a0
The Android Automerger [Tue, 21 Dec 2010 16:14:59 +0000 (08:14 -0800)]
HRH82
Change-Id: I6d8bd4b32470de573b0fcc0f95c23f4751210965
The Android Automerger [Tue, 21 Dec 2010 16:14:54 +0000 (08:14 -0800)]
merge in honeycomb-release history after reset to master
android-merger [Mon, 20 Dec 2010 23:20:06 +0000 (15:20 -0800)]
HRH81B
Change-Id: I52375d207abf6b3f07a055caec142e2fddbad2c6
Ying Wang [Mon, 20 Dec 2010 19:42:35 +0000 (11:42 -0800)]
am
098826bf: am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:40:33 +0000 (11:40 -0800)]
am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:18:28 +0000 (11:18 -0800)]
Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578
Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
The Android Automerger [Mon, 20 Dec 2010 15:38:58 +0000 (07:38 -0800)]
HRH81
Change-Id: I85f6060794ae9cd97424632aa7516d6381a9e66e
Sriram Raman [Fri, 17 Dec 2010 23:31:42 +0000 (18:31 -0500)]
HRH78B
Change-Id: I65eb4397d97f4d4867009f256e77aad144e56cff
The Android Automerger [Fri, 17 Dec 2010 21:44:54 +0000 (13:44 -0800)]
HRH78
Change-Id: I4b30ef0932212edf0e77cd4f81fff0feba14e843
The Android Automerger [Fri, 17 Dec 2010 21:44:52 +0000 (13:44 -0800)]
Merge branch 'master' into honeycomb-release
* master:
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Sriram Raman [Fri, 17 Dec 2010 01:17:36 +0000 (20:17 -0500)]
HRH77B
Change-Id: Ic22ccd5d3cbfa6d72e92761895be6bc55ee5a9d0
OSDN Git Service
