OSDN Git Service
The Android Automerger [Thu, 9 Aug 2012 23:02:33 +0000 (16:02 -0700)]
JOO40B
The Android Automerger [Thu, 9 Aug 2012 16:30:20 +0000 (09:30 -0700)]
JOO40
The Android Automerger [Thu, 9 Aug 2012 16:29:42 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Colin Cross [Thu, 9 Aug 2012 00:53:37 +0000 (17:53 -0700)]
Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev
Ying Wang [Wed, 8 Aug 2012 22:27:00 +0000 (15:27 -0700)]
Don't install overridden packages in pdk fusion files.
Bug:
6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
The Android Automerger [Wed, 8 Aug 2012 22:06:55 +0000 (15:06 -0700)]
JOO39B
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:06:28 +0000 (14:06 -0700)]
am
35b24a82: am
8776f34a: Merge "x86: cleanups for toolchain"
* commit '
35b24a8234baa93d23a9ea029b8e8e675b134f7d':
x86: cleanups for toolchain
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:17 +0000 (14:04 -0700)]
am
8776f34a: Merge "x86: cleanups for toolchain"
* commit '
8776f34aaad8394caf58b864a41765b7ced52a65':
x86: cleanups for toolchain
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]
Merge "x86: cleanups for toolchain"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:26:40 +0000 (13:26 -0700)]
am
a4814370: am
4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
* commit '
a4814370724634c0ee0bf35bc68f382f0df93668':
definitions.mk: Don't use GCC '@' parameter
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:24:44 +0000 (13:24 -0700)]
am
4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
* commit '
4733cfd2de0bed2dfdf4c32517b0c59762c85b2e':
definitions.mk: Don't use GCC '@' parameter
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:18:56 +0000 (13:18 -0700)]
Merge "definitions.mk: Don't use GCC '@' parameter"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:07:59 +0000 (13:07 -0700)]
am
04363aa5: am
af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
* commit '
04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
core/Makefile: also look for device/*/build/tasks
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:06:25 +0000 (13:06 -0700)]
am
af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
* commit '
af541a64abd16f6a33146a833dce71e739b722c8':
core/Makefile: also look for device/*/build/tasks
Colin Cross [Wed, 8 Aug 2012 19:59:32 +0000 (12:59 -0700)]
recovery: don't delete hardware specific init*.rc files
init used to automatically execute hardware specific init.rc files from
init.<hardware>.rc. If the hardware specific init.rc file was installed
in recovery.img, various unwanted services would try to start, so init*.rc
was deleted when creating the recovery root directory.
init was recently modified to explicitly import init.${ro.hardware}.rc
from the default init.rc, rather than always trying to load it. Since
recovery replaces the default init.rc with a custom one, it will never
try to load hardware specific init files.
In addition, there are cases where we need to start hardware specific
services, for example watchdogd, so we need
init.recovery.${ro.hardware}.rc to be installed.
Modify the build rule to delete the default init.rc from the recovery
root directory so it can be replaced with the custom recovery init.rc,
but leave all the hardware specific init files in place.
Bug:
6953625
Change-Id: I5d9555e3d54d2f1d9f49fb981bd412c53741337e
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]
Merge "core/Makefile: also look for device/*/build/tasks"
Scott Main [Wed, 8 Aug 2012 19:50:59 +0000 (12:50 -0700)]
am
c8b7dfb1: am
0e71cee2: docs: make landing pages w/o image span the full page width
* commit '
c8b7dfb1e308d7dbe426724d21b932b8b79d9ab5':
docs: make landing pages w/o image span the full page width
Scott Main [Wed, 8 Aug 2012 19:48:58 +0000 (12:48 -0700)]
am
0e71cee2: docs: make landing pages w/o image span the full page width
* commit '
0e71cee2bbe5aac3a5e502936cac46b830af0067':
docs: make landing pages w/o image span the full page width
The Android Automerger [Wed, 8 Aug 2012 13:48:58 +0000 (06:48 -0700)]
JOO39
The Android Automerger [Wed, 8 Aug 2012 13:33:28 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Tue, 7 Aug 2012 22:14:08 +0000 (15:14 -0700)]
am
fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
fe9a455a24a863eaf96520b761ea284cc3cd15ee':
JZO38
The Android Open Source Project [Tue, 7 Aug 2012 21:58:18 +0000 (14:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce
Scott Main [Tue, 7 Aug 2012 20:59:43 +0000 (13:59 -0700)]
docs: make landing pages w/o image span the full page width
Change-Id: I96af0c7e1443079820c44b589b0c3ef638ae9c86
The Android Automerger [Tue, 7 Aug 2012 20:02:14 +0000 (13:02 -0700)]
JZO38
The Android Automerger [Tue, 7 Aug 2012 20:00:36 +0000 (13:00 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 7 Aug 2012 18:12:57 +0000 (11:12 -0700)]
JOO38B
The Android Automerger [Tue, 7 Aug 2012 13:36:03 +0000 (06:36 -0700)]
JOO38
The Android Automerger [Tue, 7 Aug 2012 13:33:35 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Scott Main [Tue, 7 Aug 2012 01:58:36 +0000 (18:58 -0700)]
am
fe50d923: am
9332a459: docs: comment-out unused style (the png currently does not resolve)
* commit '
fe50d92396f00e07bc77be1e95ffb5c8b0c989bd':
docs: comment-out unused style (the png currently does not resolve)
Scott Main [Tue, 7 Aug 2012 01:56:45 +0000 (18:56 -0700)]
am
9332a459: docs: comment-out unused style (the png currently does not resolve)
* commit '
9332a459186e467aba6b3b9b8c16e0fd3dc84860':
docs: comment-out unused style (the png currently does not resolve)
Scott Main [Tue, 7 Aug 2012 01:54:18 +0000 (18:54 -0700)]
docs: comment-out unused style (the png currently does not resolve)
Change-Id: I665068f0808a81c98cbd0685f68ed7f4df4cf0e0
The Android Open Source Project [Mon, 6 Aug 2012 20:51:47 +0000 (13:51 -0700)]
am
1210541b: (-s ours) Reconcile with jb-release - do not merge
* commit '
1210541bfd9a3359cec9c00c42caaa74d2a65f5a':
JRO03O
The Android Open Source Project [Mon, 6 Aug 2012 20:49:54 +0000 (13:49 -0700)]
Reconcile with jb-release - do not merge
Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319
The Android Automerger [Mon, 6 Aug 2012 20:06:02 +0000 (13:06 -0700)]
JOO37B
The Android Automerger [Mon, 6 Aug 2012 19:32:03 +0000 (12:32 -0700)]
JRO03O
The Android Automerger [Mon, 6 Aug 2012 13:30:31 +0000 (06:30 -0700)]
JOO37
The Android Automerger [Mon, 6 Aug 2012 13:27:33 +0000 (06:27 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Sat, 4 Aug 2012 00:46:48 +0000 (17:46 -0700)]
Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev
Ying Wang [Sat, 4 Aug 2012 00:43:00 +0000 (17:43 -0700)]
Add libstagefright and libstagefright_chromium_http to core.mk.
Bug:
6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
The Android Automerger [Fri, 3 Aug 2012 22:01:00 +0000 (15:01 -0700)]
JOO33C
Paul Westbrook [Fri, 3 Aug 2012 21:21:56 +0000 (14:21 -0700)]
Merge "Add imap2 to the build" into jb-mr1-dev
The Android Open Source Project [Fri, 3 Aug 2012 20:25:06 +0000 (13:25 -0700)]
am
ad808f5d: (-s ours) Reconcile with jb-release - do not merge
* commit '
ad808f5da422b13489edb04b38daf871e5f977a6':
JRO03L
JRO03K
JRO03J
JRO03I
The Android Open Source Project [Fri, 3 Aug 2012 20:23:06 +0000 (13:23 -0700)]
Reconcile with jb-release - do not merge
Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a
The Android Open Source Project [Fri, 3 Aug 2012 19:11:39 +0000 (12:11 -0700)]
Reconcile AOSP and GOOG jb-release
Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611
Paul Westbrook [Fri, 3 Aug 2012 18:46:02 +0000 (11:46 -0700)]
Add imap2 to the build
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J
Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I
The Android Automerger [Fri, 3 Aug 2012 14:37:30 +0000 (07:37 -0700)]
JOO33B take two
Shih-wei Liao [Fri, 3 Aug 2012 12:17:23 +0000 (05:17 -0700)]
Fix build: After merging in Clang, -Wno-psabi is no longer supported.
-Wno-unused-but-set-variable is not supported either.
Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086
Doug Zongker [Thu, 2 Aug 2012 21:46:42 +0000 (14:46 -0700)]
add extra args to mkbootimg
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.
Bug:
6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
The Android Automerger [Fri, 3 Aug 2012 02:03:27 +0000 (19:03 -0700)]
JOO33B
Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]
Merge "add extra args to mkbootimg" into jb-mr1-dev
Doug Zongker [Thu, 2 Aug 2012 21:46:42 +0000 (14:46 -0700)]
add extra args to mkbootimg
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.
Bug:
6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 20:00:44 +0000 (13:00 -0700)]
JOO33 take two
Keun young Park [Thu, 2 Aug 2012 19:51:59 +0000 (12:51 -0700)]
keep PLATFORM_ZIP specified explicitly
- the old behaviour was to override with default one, which makes
trying different sets of platform.zip difficult if default one exists
Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
The Android Automerger [Thu, 2 Aug 2012 15:18:45 +0000 (08:18 -0700)]
JOO33
The Android Automerger [Thu, 2 Aug 2012 15:18:08 +0000 (08:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 2 Aug 2012 14:06:08 +0000 (07:06 -0700)]
JOO32C
The Android Automerger [Thu, 2 Aug 2012 14:00:53 +0000 (07:00 -0700)]
JOO33
The Android Automerger [Thu, 2 Aug 2012 14:00:32 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:39:11 +0000 (15:39 -0700)]
Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:02:35 +0000 (15:02 -0700)]
add missing telephony libs for PDK mini config
Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99
Roman Nurik [Wed, 1 Aug 2012 21:48:36 +0000 (14:48 -0700)]
am
2461af44: am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
Improve print stylesheet for d.a.c.
Keun young Park [Wed, 1 Aug 2012 20:08:55 +0000 (13:08 -0700)]
Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 00:13:20 +0000 (17:13 -0700)]
add symbol files to PDK release for debugging
- app_process is not in PDK, and this makes native debugging difficult
So provide symbol file instead of source
Bug:
6774048
Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
Roman Nurik [Wed, 1 Aug 2012 19:41:10 +0000 (12:41 -0700)]
am
c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '
c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
Improve print stylesheet for d.a.c.
Roman Nurik [Wed, 1 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Merge "Improve print stylesheet for d.a.c." into jb-dev
Roman Nurik [Wed, 1 Aug 2012 17:37:40 +0000 (10:37 -0700)]
Improve print stylesheet for d.a.c.
- Improve printed page margins
- Hide navigational elements
- Print link URLs
- Improve spacing on key elements
Change-Id: Ic487e00636b1d06f15d7a29b4162c9e31f5569b1
Scott Main [Wed, 1 Aug 2012 19:15:24 +0000 (12:15 -0700)]
am
b736e07c: am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
b736e07cbb9b0b3c0ccdc6352a10b36d244aebbc':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:12:51 +0000 (12:12 -0700)]
am
2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone.
* commit '
2ccbd3f8d44bbc9b7a542144751767fe093083e7':
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Scott Main [Wed, 1 Aug 2012 19:05:12 +0000 (12:05 -0700)]
change "nolist" style to be simply remove bullets and indent; leave the rest alone.
Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a
The Android Automerger [Wed, 1 Aug 2012 14:18:49 +0000 (07:18 -0700)]
JOO32
The Android Automerger [Wed, 1 Aug 2012 14:18:30 +0000 (07:18 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Tue, 31 Jul 2012 21:49:13 +0000 (14:49 -0700)]
am
8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
8665eb732364b31506719dcce99237e13cc87866':
JZO31
JRO03N
JRO03M
The Android Open Source Project [Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95
The Android Automerger [Tue, 31 Jul 2012 21:08:19 +0000 (14:08 -0700)]
JZO31
The Android Automerger [Tue, 31 Jul 2012 21:07:00 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 31 Jul 2012 20:09:31 +0000 (13:09 -0700)]
JOO31B
Scott Main [Tue, 31 Jul 2012 19:47:42 +0000 (12:47 -0700)]
am
37132103: am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
37132103a2d60c7ceb0ede1f34d8b3c633d7c09e':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:45:28 +0000 (12:45 -0700)]
am
a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev
* commit '
a8d7485de2d43e2c9c77ed62638174742bc66d1f':
add script to create links on topic landing page for first doc that use the doc's title
Scott Main [Tue, 31 Jul 2012 19:43:28 +0000 (12:43 -0700)]
Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev
The Android Automerger [Tue, 31 Jul 2012 15:18:14 +0000 (08:18 -0700)]
JRO03N
The Android Automerger [Tue, 31 Jul 2012 14:35:49 +0000 (07:35 -0700)]
JOO31
The Android Automerger [Tue, 31 Jul 2012 14:35:14 +0000 (07:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Tue, 31 Jul 2012 00:38:04 +0000 (17:38 -0700)]
This branch is now JB MR1 development.
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
Scott Main [Fri, 27 Jul 2012 01:00:14 +0000 (18:00 -0700)]
add script to create links on topic landing page for first doc that use the doc's title
Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8
The Android Automerger [Mon, 30 Jul 2012 22:51:31 +0000 (15:51 -0700)]
JRO03M
The Android Automerger [Mon, 30 Jul 2012 16:46:30 +0000 (09:46 -0700)]
JOO30B
The Android Automerger [Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 14:15:33 +0000 (07:15 -0700)]
JOO30
Ed Heyl [Mon, 30 Jul 2012 05:37:03 +0000 (22:37 -0700)]
am
68bd94e2: am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
68bd94e288985af0de983950e6fb98bfea62f19f':
Add new vendors
Ed Heyl [Mon, 30 Jul 2012 05:33:18 +0000 (22:33 -0700)]
am
3d71b0c7: Merge "Add new vendors" into jb-mr1-dev
* commit '
3d71b0c7e2c28008ba9658df0138008d66bd5d4a':
Add new vendors
Ed Heyl [Sun, 29 Jul 2012 23:35:27 +0000 (16:35 -0700)]
Merge "Add new vendors" into jb-mr1-dev
Shih-wei Liao [Sun, 29 Jul 2012 18:15:48 +0000 (11:15 -0700)]
am
06f20f02: am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
06f20f0253bcbf7fd3079f6f80413aaabf91732d':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sun, 29 Jul 2012 18:13:35 +0000 (11:13 -0700)]
am
b09d26a4: Add "abcc" (bitcode compiler) and "libportable" into system.img.
* commit '
b09d26a496609fd569e94f2cfbb289ba5ea4c247':
Add "abcc" (bitcode compiler) and "libportable" into system.img.
Shih-wei Liao [Sat, 28 Jul 2012 01:04:07 +0000 (18:04 -0700)]
Add "abcc" (bitcode compiler) and "libportable" into system.img.
BUG=
6886348. NDK on llvm requires bitcode compiler and libportable.
Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:41:30 +0000 (15:41 -0700)]
Add new vendors
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
OSDN Git Service
