Commit graph

9593 commits

Author SHA1 Message Date
Kenny Root
c2872a6240 Merge "Add make_ext4fs to all builds" into jb-mr1-dev 2012-08-09 13:03:10 -07:00
Kenny Root
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
Doug Zongker
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
Colin Cross
e98b836f26 Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev 2012-08-08 17:53:38 -07:00
Ying Wang
9c649a7542 Don't install overridden packages in pdk fusion files.
Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
2012-08-08 15:36:43 -07:00
Jean-Baptiste Queru
b0cc9aae50 am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"
* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d':
  x86: cleanups for toolchain
2012-08-08 14:06:28 -07:00
Jean-Baptiste Queru
35b24a8234 am 8776f34a: Merge "x86: cleanups for toolchain"
* commit '8776f34aaad8394caf58b864a41765b7ced52a65':
  x86: cleanups for toolchain
2012-08-08 14:04:17 -07:00
Jean-Baptiste Queru
8776f34aaa Merge "x86: cleanups for toolchain" 2012-08-08 13:40:19 -07:00
Jean-Baptiste Queru
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
Jean-Baptiste Queru
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
Jean-Baptiste Queru
4733cfd2de Merge "definitions.mk: Don't use GCC '@' parameter" 2012-08-08 13:18:56 -07:00
Jean-Baptiste Queru
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
Jean-Baptiste Queru
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
Colin Cross
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
Jean-Baptiste Queru
af541a64ab Merge "core/Makefile: also look for device/*/build/tasks" 2012-08-08 12:58:56 -07:00
Scott Main
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
Scott Main
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
The Android Open Source Project
6bdeb4481e am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee':
  JZO38
2012-08-07 15:14:08 -07:00
The Android Open Source Project
fe9a455a24 Reconcile with jb-mr0-release - do not merge
Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce
2012-08-07 14:58:18 -07:00
Scott Main
0e71cee2bb docs: make landing pages w/o image span the full page width
Change-Id: I96af0c7e1443079820c44b589b0c3ef638ae9c86
2012-08-07 13:59:43 -07:00
The Android Automerger
97adb79898 JZO38 2012-08-07 13:02:14 -07:00
The Android Automerger
4a507415e1 merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:00:36 -07:00
Scott Main
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
Scott Main
fe50d92396 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)
2012-08-06 18:56:45 -07:00
Scott Main
9332a45918 docs: comment-out unused style (the png currently does not resolve)
Change-Id: I665068f0808a81c98cbd0685f68ed7f4df4cf0e0
2012-08-06 18:54:18 -07:00
The Android Open Source Project
8e3bf38977 am 1210541b: (-s ours) Reconcile with jb-release - do not merge
* commit '1210541bfd9a3359cec9c00c42caaa74d2a65f5a':
  JRO03O
2012-08-06 13:51:47 -07:00
The Android Open Source Project
1210541bfd Reconcile with jb-release - do not merge
Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319
2012-08-06 13:49:54 -07:00
The Android Automerger
b9201d1c40 JRO03O 2012-08-06 12:32:03 -07:00
Ying Wang
7f9db64d0e Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev 2012-08-03 17:46:49 -07:00
Ying Wang
c10da6c540 Add libstagefright and libstagefright_chromium_http to core.mk.
Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
2012-08-03 17:44:06 -07:00
Paul Westbrook
acf206bc5e Merge "Add imap2 to the build" into jb-mr1-dev 2012-08-03 14:21:56 -07:00
The Android Open Source Project
fa3c2d9a76 am ad808f5d: (-s ours) Reconcile with jb-release - do not merge
* commit 'ad808f5da422b13489edb04b38daf871e5f977a6':
  JRO03L
  JRO03K
  JRO03J
  JRO03I
2012-08-03 13:25:06 -07:00
The Android Open Source Project
ad808f5da4 Reconcile with jb-release - do not merge
Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a
2012-08-03 13:23:06 -07:00
The Android Open Source Project
d842ff1660 Reconcile AOSP and GOOG jb-release
Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611
2012-08-03 12:11:39 -07:00
Paul Westbrook
95781f03c9 Add imap2 to the build
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
2012-08-03 11:47:53 -07:00
The Android Automerger
43c06c9a3b JRO03L 2012-08-03 11:34:17 -07:00
The Android Automerger
ad0fad3b8e JRO03K 2012-08-03 11:34:12 -07:00
The Android Automerger
524b316b8e JRO03J
Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43
2012-08-03 11:33:54 -07:00
The Android Automerger
5a625796d6 JRO03I 2012-08-03 11:33:28 -07:00
Shih-wei Liao
c814bcefd7 Fix build: After merging in Clang, -Wno-psabi is no longer supported.
-Wno-unused-but-set-variable is not supported either.

Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086
2012-08-03 05:17:23 -07:00
Doug Zongker
1e845d33af Merge "add extra args to mkbootimg" into jb-mr1-dev 2012-08-02 15:06:10 -07:00
Doug Zongker
d513160b76 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
2012-08-02 15:03:41 -07:00
Keun young Park
15b2b0f711 Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev 2012-08-02 14:29:05 -07:00
Keun young Park
4da8e127c7 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
2012-08-02 12:51:59 -07:00
Keun young Park
cdbf0292e4 Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev 2012-08-01 15:39:12 -07:00
Keun young Park
add5271a56 add missing telephony libs for PDK mini config
Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99
2012-08-01 15:02:35 -07:00
Roman Nurik
f5bd3bce67 am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit '2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
  Improve print stylesheet for d.a.c.
2012-08-01 14:48:36 -07:00
Keun young Park
fad81e8997 Merge "add symbol files to PDK release for debugging" into jb-mr1-dev 2012-08-01 13:08:56 -07:00
Keun young Park
722266918f 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
2012-08-01 12:49:01 -07:00
Roman Nurik
2461af44c1 am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
* commit 'c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
  Improve print stylesheet for d.a.c.
2012-08-01 12:41:10 -07:00