OSDN Git Service
The Android Automerger [Fri, 25 Jan 2013 00:20:50 +0000 (16:20 -0800)]
JWQ24B
The Android Automerger [Thu, 24 Jan 2013 15:11:33 +0000 (07:11 -0800)]
JWQ24
The Android Automerger [Thu, 24 Jan 2013 15:10:06 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
The Android Automerger [Thu, 24 Jan 2013 00:15:14 +0000 (16:15 -0800)]
JWQ23B
Stephen Hines [Wed, 23 Jan 2013 18:39:05 +0000 (18:39 +0000)]
Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects."
This reverts commit
ba6a7e1d46ef48d1dc58f3313e56613067ed07fb
Change-Id: I2855923e67c226d39fe362342570e9ab96b885b8
The Android Automerger [Wed, 23 Jan 2013 15:11:53 +0000 (07:11 -0800)]
JWQ23
The Android Automerger [Wed, 23 Jan 2013 15:10:08 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Thu, 17 Jan 2013 00:02:08 +0000 (16:02 -0800)]
libclcore.bc comes from prebuilts/sdk for unbundled projects.
This change also adds the NDK library path for unbundled builds.
Bug:
7419958
Change-Id: If22823c3890f5507d486e654a1e0296c06a2e239
The Android Automerger [Tue, 22 Jan 2013 23:19:37 +0000 (15:19 -0800)]
JWQ22B
The Android Automerger [Tue, 22 Jan 2013 15:10:55 +0000 (07:10 -0800)]
JWQ22
The Android Automerger [Tue, 22 Jan 2013 15:10:03 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Thu, 10 Jan 2013 09:51:01 +0000 (01:51 -0800)]
Update build for LLVM merge to r171906.
Change-Id: Ib1e701e548bd3e11cdee712fcbb8266447dfb21a
The Android Automerger [Mon, 21 Jan 2013 15:11:42 +0000 (07:11 -0800)]
JWQ21
The Android Automerger [Mon, 21 Jan 2013 15:10:10 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Sat, 19 Jan 2013 01:22:21 +0000 (01:22 +0000)]
Merge "Build RS compatibility objects with libcompiler-rt.a."
Stephen Hines [Sat, 19 Jan 2013 00:27:23 +0000 (16:27 -0800)]
Build RS compatibility objects with libcompiler-rt.a.
Change-Id: Ic49fdc30b1d4568bbdc94338e116a31a1ade1e80
The Android Automerger [Fri, 18 Jan 2013 15:11:37 +0000 (07:11 -0800)]
JWQ18
The Android Automerger [Fri, 18 Jan 2013 15:10:10 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Fri, 18 Jan 2013 02:15:01 +0000 (18:15 -0800)]
am
58aee9e3: (-s ours) am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
58aee9e30e3a8dd4471344d9ae5c514c38b42548':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Ying Wang [Fri, 18 Jan 2013 02:13:08 +0000 (18:13 -0800)]
am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
383ecfaf023dab1fcab25d97548093e32ef1a564':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Ying Wang [Tue, 4 Dec 2012 02:24:55 +0000 (18:24 -0800)]
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit
fe3f62d06b77888cddf0365a40b20835eeac221f
in master. Since this is already in master, and we're upstream,
set to DO NOT MERGE.
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
The Android Automerger [Thu, 17 Jan 2013 22:00:30 +0000 (14:00 -0800)]
JWQ17B
Chiao Cheng [Thu, 17 Jan 2013 20:50:31 +0000 (12:50 -0800)]
Move Dialer app from core to telephony product target.
Bug:
8014407
Change-Id: I76ca58c4cbf05ebbd64131c17075ad4b8a919326
The Android Automerger [Thu, 17 Jan 2013 15:11:26 +0000 (07:11 -0800)]
JWQ17
The Android Automerger [Thu, 17 Jan 2013 15:10:12 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 16 Jan 2013 21:53:23 +0000 (13:53 -0800)]
JWQ16B
The Android Automerger [Wed, 16 Jan 2013 18:53:39 +0000 (10:53 -0800)]
JWQ16
The Android Automerger [Wed, 16 Jan 2013 18:09:07 +0000 (10:09 -0800)]
merge in jb-mr2-release history after reset to master
Ben Cheng [Tue, 15 Jan 2013 22:36:42 +0000 (14:36 -0800)]
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Bug:
7961327
Change-Id: I8a3637a87b5a0f791568fe74e44a4a173541deb7
Ying Wang [Tue, 15 Jan 2013 23:28:08 +0000 (15:28 -0800)]
Support to switch between prebuilt and buiding from source
For target shared library and executable.
Change-Id: I40a4e4e0c971811ac60e9bd04206f2422387d3d0
Scott Main [Tue, 15 Jan 2013 05:16:42 +0000 (21:16 -0800)]
am
85ab41eb: am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
85ab41eb6b7229dd1fcb08187f27a32ee754c05d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:13:27 +0000 (21:13 -0800)]
am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Ben Cheng [Mon, 14 Jan 2013 23:07:59 +0000 (15:07 -0800)]
Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."
Ben Cheng [Mon, 14 Jan 2013 21:45:45 +0000 (13:45 -0800)]
Use -mcpu=cortex-a15 for gcc arch dependent compilation.
If TARGET_CPU_VARIANT=cortex-a15 is specified in the BoardConfig.mk file.
Bug:
7961327
Change-Id: Ic459df378293237c54263f5315ac3be62dad4273
The Android Automerger [Mon, 14 Jan 2013 15:51:17 +0000 (07:51 -0800)]
AAQ14
The Android Automerger [Mon, 14 Jan 2013 15:49:06 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Ying Wang [Fri, 11 Jan 2013 23:31:06 +0000 (15:31 -0800)]
Add new LOCAL_PROGUARD_ENABLED option "nosystem"
With which we don't include proguard flags defined by the build system.
Bug:
7990659
Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
The Android Automerger [Fri, 11 Jan 2013 15:51:33 +0000 (07:51 -0800)]
AAQ11
The Android Automerger [Fri, 11 Jan 2013 15:49:08 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Fri, 11 Jan 2013 00:10:34 +0000 (16:10 -0800)]
AAQ10B
Scott Main [Thu, 10 Jan 2013 23:38:23 +0000 (15:38 -0800)]
am
18ae42f3: am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
Ying Wang [Thu, 10 Jan 2013 22:28:56 +0000 (14:28 -0800)]
resolved conflicts for merge of
e016e80c to jb-mr1-dev-plus-aosp
Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
The Android Automerger [Thu, 10 Jan 2013 15:50:57 +0000 (07:50 -0800)]
AAQ10
The Android Automerger [Thu, 10 Jan 2013 15:49:05 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Thu, 10 Jan 2013 00:48:48 +0000 (16:48 -0800)]
AAQ09B
The Android Automerger [Wed, 9 Jan 2013 15:51:08 +0000 (07:51 -0800)]
AAQ09
The Android Automerger [Wed, 9 Jan 2013 15:49:05 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Scott Main [Wed, 9 Jan 2013 02:59:29 +0000 (18:59 -0800)]
am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:49:51 +0000 (18:49 -0800)]
am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:17:19 +0000 (08:17 -0800)]
am
b81bc684: am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:13:50 +0000 (08:13 -0800)]
am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 15:55:50 +0000 (07:55 -0800)]
Merge "Change Email2 reference back to Email"
The Android Automerger [Tue, 8 Jan 2013 15:50:56 +0000 (07:50 -0800)]
AAQ08
The Android Automerger [Tue, 8 Jan 2013 15:49:02 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Roger Chen [Tue, 8 Jan 2013 13:20:32 +0000 (21:20 +0800)]
Change Email2 reference back to Email
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
The Android Automerger [Mon, 7 Jan 2013 15:50:25 +0000 (07:50 -0800)]
AAQ07
The Android Automerger [Mon, 7 Jan 2013 15:49:04 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Ying Wang [Sat, 5 Jan 2013 01:50:46 +0000 (17:50 -0800)]
am
71195ec7: am
d01d0bf8: am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
core/Makefile: Allow specification of file locations
Ying Wang [Sat, 5 Jan 2013 01:50:43 +0000 (17:50 -0800)]
am
a40166d1: am
5455455a: am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a40166d11c597038b30eab6122f8967ee1c810b3':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 23:30:28 +0000 (15:30 -0800)]
am
d01d0bf8: am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
d01d0bf86c2309a7a950549c9c124b303c0c3f82':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:28:20 +0000 (15:28 -0800)]
am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:01:49 +0000 (15:01 -0800)]
Merge "core/Makefile: Allow specification of file locations"
Ying Wang [Fri, 4 Jan 2013 23:01:18 +0000 (15:01 -0800)]
am
5455455a: am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
5455455a3e550821b381d061803133c82956d7ec':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:59:20 +0000 (14:59 -0800)]
am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:55:21 +0000 (14:55 -0800)]
am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
Andrew Boie [Fri, 28 Sep 2012 16:33:45 +0000 (09:33 -0700)]
core/Makefile: Allow specification of file locations
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.
Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
The Android Automerger [Fri, 4 Jan 2013 15:50:28 +0000 (07:50 -0800)]
AAQ04
The Android Automerger [Fri, 4 Jan 2013 15:49:08 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Doug Zongker [Thu, 3 Jan 2013 23:19:19 +0000 (15:19 -0800)]
am
96045fb5: am
f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
* commit '
96045fb58488a24689e7449700c53614d9336572':
SignApk: perform the whole file signature in a single streaming pass.
Doug Zongker [Thu, 3 Jan 2013 23:12:43 +0000 (15:12 -0800)]
am
f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
* commit '
f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
SignApk: perform the whole file signature in a single streaming pass.
Doug Zongker [Thu, 3 Jan 2013 22:50:36 +0000 (14:50 -0800)]
Merge "SignApk: perform the whole file signature in a single streaming pass."
Koushik Dutta [Tue, 18 Dec 2012 06:25:22 +0000 (22:25 -0800)]
SignApk: perform the whole file signature in a single streaming pass.
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
The Android Automerger [Thu, 3 Jan 2013 15:51:15 +0000 (07:51 -0800)]
AAQ03
The Android Automerger [Thu, 3 Jan 2013 15:49:12 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Doug Zongker [Thu, 3 Jan 2013 00:34:54 +0000 (16:34 -0800)]
am
2d867bd2: am
57a5e52d: Merge "add multiple key support to signapk"
* commit '
2d867bd207014abc803199f8a76de84c90f9a4aa':
add multiple key support to signapk
Doug Zongker [Wed, 2 Jan 2013 22:45:12 +0000 (14:45 -0800)]
am
57a5e52d: Merge "add multiple key support to signapk"
* commit '
57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
Doug Zongker [Wed, 2 Jan 2013 21:49:02 +0000 (13:49 -0800)]
Merge "add multiple key support to signapk"
Doug Zongker [Tue, 16 Oct 2012 00:10:13 +0000 (17:10 -0700)]
add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.
Bug:
7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
The Android Automerger [Wed, 2 Jan 2013 15:49:18 +0000 (07:49 -0800)]
AAQ02
The Android Automerger [Wed, 2 Jan 2013 15:49:02 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Tue, 1 Jan 2013 15:49:20 +0000 (07:49 -0800)]
AAQ01
The Android Automerger [Tue, 1 Jan 2013 15:49:04 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Mon, 31 Dec 2012 15:51:10 +0000 (07:51 -0800)]
AAP92
The Android Automerger [Mon, 31 Dec 2012 15:49:15 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Andrew Hsieh [Fri, 28 Dec 2012 17:47:53 +0000 (09:47 -0800)]
am
dd319cef: am
26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
* commit '
dd319cef3f0e351f0b1621167b22eb39e86b27ad':
Switch to GCC 4.7 for X86 and MIPS
The Android Open Source Project [Fri, 28 Dec 2012 17:47:32 +0000 (09:47 -0800)]
am
f6315729: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
f6315729088bb1ebbf5d8ab6e810dd3462973018':
JDP82
The Android Open Source Project [Fri, 28 Dec 2012 17:46:43 +0000 (09:46 -0800)]
am
9b2ef223: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
9b2ef2237229ca1ce38df2d54550985ec5f7fdaf':
JDP81B
The Android Automerger [Fri, 28 Dec 2012 15:49:37 +0000 (07:49 -0800)]
AAP89
The Android Automerger [Fri, 28 Dec 2012 15:49:03 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Thu, 27 Dec 2012 15:49:41 +0000 (07:49 -0800)]
AAP88
The Android Automerger [Thu, 27 Dec 2012 15:49:04 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Wed, 26 Dec 2012 15:49:19 +0000 (07:49 -0800)]
AAP87
The Android Automerger [Wed, 26 Dec 2012 15:49:03 +0000 (07:49 -0800)]
merge in master-release history after reset to master
OSDN Git Service
