f09cdd928d
am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'baa97012143a8601aff04428a179446d8182a4a4':
JZO40
2012-08-10 12:40:20 -07:00
baa9701214
am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
2012-08-10 12:36:39 -07:00
8e1a875335
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5
2012-08-10 08:51:46 -07:00
d4c6a2edde
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41
2012-08-10 08:33:53 -07:00
d1dc01c4a3
JOO40B
2012-08-09 16:02:33 -07:00
623a098c0d
am c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-dev
...
* commit 'c2872a62402c7e075a1f9cfba04c4e4d65c30c8f':
Add make_ext4fs to all builds
2012-08-09 13:04:58 -07:00
c2872a6240
Merge "Add make_ext4fs to all builds" into jb-mr1-dev
2012-08-09 13:03:10 -07:00
c8d8a1e62b
am 72f0b676: tidy up building of recovery ramdisk image
...
* commit '72f0b67673adecd824bf177b680b20b93e3bc6ed':
tidy up building of recovery ramdisk image
2012-08-09 12:42:44 -07:00
720479ea7e
Add make_ext4fs to all builds
...
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
Bug: 6960586
Change-Id: I7c10b8065a76ec7a43f79445f429d5a93750585d
2012-08-09 12:20:16 -07:00
951f93e91e
JZO40
2012-08-09 11:37:32 -07:00
9a031b9e79
merge in jb-mr0-release history after reset to jb-dev
2012-08-09 11:36:36 -07:00
cd6afb8c4c
JOO40
2012-08-09 09:30:20 -07:00
30f516b4ae
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:42 -07:00
72f0b67673
tidy up building of recovery ramdisk image
...
Copy init.recovery.*.rc files (if any) from the main system ramdisk,
and hide all the commands.
Change-Id: I4d4fcf25b66ddea70e43282d466983e9643c9bea
2012-08-09 08:56:01 -07:00
7aeaaa04a0
am e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files" into jb-mr1-dev
...
* commit 'e98b836f261aa822204f5fdbae7cfde6c77dbfba':
recovery: don't delete hardware specific init*.rc files
2012-08-08 17:55:31 -07:00
e98b836f26
Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev
2012-08-08 17:53:38 -07:00
e1770f5fc8
am 9c649a75: Don\'t install overridden packages in pdk fusion files.
...
* commit '9c649a7542ee3fda57a1836ad0ddcd8d19921f5b':
Don't install overridden packages in pdk fusion files.
2012-08-08 15:40:21 -07:00
9c649a7542
Don't install overridden packages in pdk fusion files.
...
Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
2012-08-08 15:36:43 -07:00
229dad6d21
JOO39B
2012-08-08 15:06:55 -07:00
f5bbfe825a
am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"
...
* commit 'b0cc9aae50089f0b77d6adc74f4d6027f0316b52':
x86: cleanups for toolchain
2012-08-08 14:09:09 -07:00
b0cc9aae50
am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"
...
* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d':
x86: cleanups for toolchain
2012-08-08 14:06:28 -07:00
35b24a8234
am 8776f34a: Merge "x86: cleanups for toolchain"
...
* commit '8776f34aaad8394caf58b864a41765b7ced52a65':
x86: cleanups for toolchain
2012-08-08 14:04:17 -07:00
8776f34aaa
Merge "x86: cleanups for toolchain"
2012-08-08 13:40:19 -07:00
61c4a50edb
am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
...
* commit '1870b7f4f26f5c1d32e767dad7a05c69e1679a3d':
definitions.mk: Don't use GCC '@' parameter
2012-08-08 13:28:54 -07:00
1870b7f4f2
am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
...
* commit 'a4814370724634c0ee0bf35bc68f382f0df93668':
definitions.mk: Don't use GCC '@' parameter
2012-08-08 13:26:40 -07:00
a481437072
am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
...
* commit '4733cfd2de0bed2dfdf4c32517b0c59762c85b2e':
definitions.mk: Don't use GCC '@' parameter
2012-08-08 13:24:44 -07:00
4733cfd2de
Merge "definitions.mk: Don't use GCC '@' parameter"
2012-08-08 13:18:56 -07:00
98092627cd
am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
...
* commit '7de61d1471cd8938ade62ae439cad11ea141cf40':
core/Makefile: also look for device/*/build/tasks
2012-08-08 13:10:06 -07:00
7de61d1471
am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
...
* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
core/Makefile: also look for device/*/build/tasks
2012-08-08 13:07:59 -07:00
04363aa5bd
am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
...
* commit 'af541a64abd16f6a33146a833dce71e739b722c8':
core/Makefile: also look for device/*/build/tasks
2012-08-08 13:06:25 -07:00
629c87b832
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
2012-08-08 13:04:58 -07:00
af541a64ab
Merge "core/Makefile: also look for device/*/build/tasks"
2012-08-08 12:58:56 -07:00
4587a9c2d4
am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width
...
* commit '0207498d6e1933244c287eed7737c0518d7d8a26':
docs: make landing pages w/o image span the full page width
2012-08-08 12:53:14 -07:00
0207498d6e
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
2012-08-08 12:50:59 -07:00
c8b7dfb1e3
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
2012-08-08 12:48:58 -07:00
094c637b04
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I51e7a05d068725eb54c9cc38ab770707f7082c62
2012-08-08 08:15:43 -07:00
4579c9cbda
JOO39
2012-08-08 06:48:58 -07:00
3e0e46e046
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-08 06:33:28 -07:00
8d950f8424
am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '6bdeb4481e3e447d5234426a6c9cc74cbf103bab':
JZO38
2012-08-07 15:16:15 -07:00
6bdeb4481e
am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee':
JZO38
2012-08-07 15:14:08 -07:00
fe9a455a24
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce
2012-08-07 14:58:18 -07:00
0e71cee2bb
docs: make landing pages w/o image span the full page width
...
Change-Id: I96af0c7e1443079820c44b589b0c3ef638ae9c86
2012-08-07 13:59:43 -07:00
97adb79898
JZO38
2012-08-07 13:02:14 -07:00
4a507415e1
merge in jb-mr0-release history after reset to jb-dev
2012-08-07 13:00:36 -07:00
9c593ceea0
JOO38B
2012-08-07 11:12:57 -07:00
84d8513a5c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc
2012-08-07 11:02:36 -07:00
113e856969
JOO38
2012-08-07 06:36:03 -07:00
5982726ebd
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:33:35 -07:00
cbe053ce2a
am aad5e32f: am fe50d923: am 9332a459: docs: comment-out unused style (the png currently does not resolve)
...
* commit 'aad5e32f6ac517d24fa01b74172cec8085f19bda':
docs: comment-out unused style (the png currently does not resolve)
2012-08-06 19:00:09 -07:00
aad5e32f6a
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)
2012-08-06 18:58:36 -07:00
The Android Open Source Project