OSDN Git Service

android-x86/build.git
12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 10 Aug 2012 15:51:46 +0000 (08:51 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5

12 years agoJOO40B
The Android Automerger [Thu, 9 Aug 2012 23:02:33 +0000 (16:02 -0700)]
JOO40B

12 years agoam c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-dev
Kenny Root [Thu, 9 Aug 2012 20:04:58 +0000 (13:04 -0700)]
am c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-dev

* commit 'c2872a62402c7e075a1f9cfba04c4e4d65c30c8f':
  Add make_ext4fs to all builds

12 years agoMerge "Add make_ext4fs to all builds" into jb-mr1-dev
Kenny Root [Thu, 9 Aug 2012 20:03:10 +0000 (13:03 -0700)]
Merge "Add make_ext4fs to all builds" into jb-mr1-dev

12 years agoam 72f0b676: tidy up building of recovery ramdisk image
Doug Zongker [Thu, 9 Aug 2012 19:42:44 +0000 (12:42 -0700)]
am 72f0b676: tidy up building of recovery ramdisk image

* commit '72f0b67673adecd824bf177b680b20b93e3bc6ed':
  tidy up building of recovery ramdisk image

12 years agoAdd make_ext4fs to all builds
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
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

12 years agoJOO40
The Android Automerger [Thu, 9 Aug 2012 16:30:20 +0000 (09:30 -0700)]
JOO40

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agotidy up building of recovery ramdisk image
Doug Zongker [Wed, 8 Aug 2012 23:26:17 +0000 (16:26 -0700)]
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

12 years agoam e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files" into...
Colin Cross [Thu, 9 Aug 2012 00:55:31 +0000 (17:55 -0700)]
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

12 years agoMerge "recovery: don't delete hardware specific init*.rc files" into 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

12 years agoam 9c649a75: Don\'t install overridden packages in pdk fusion files.
Ying Wang [Wed, 8 Aug 2012 22:40:21 +0000 (15:40 -0700)]
am 9c649a75: Don\'t install overridden packages in pdk fusion files.

* commit '9c649a7542ee3fda57a1836ad0ddcd8d19921f5b':
  Don't install overridden packages in pdk fusion files.

12 years agoDon't install overridden packages in pdk fusion files.
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

12 years agoJOO39B
The Android Automerger [Wed, 8 Aug 2012 22:06:55 +0000 (15:06 -0700)]
JOO39B

12 years agoam b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:09:09 +0000 (14:09 -0700)]
am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit 'b0cc9aae50089f0b77d6adc74f4d6027f0316b52':
  x86: cleanups for toolchain

12 years agoam 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"
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

12 years agoam 8776f34a: Merge "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

12 years agoMerge "x86: cleanups for toolchain"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:18 +0000 (13:40 -0700)]
Merge "x86: cleanups for toolchain"

12 years agoam 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@...
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:28:54 +0000 (13:28 -0700)]
am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit '1870b7f4f26f5c1d32e767dad7a05c69e1679a3d':
  definitions.mk: Don't use GCC '@' parameter

12 years agoam a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
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

12 years agoam 4733cfd2: Merge "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

12 years agoMerge "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"

12 years agoam 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for device...
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:10:06 +0000 (13:10 -0700)]
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

12 years agoam 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
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

12 years agoam af541a64: Merge "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

12 years agorecovery: don't delete hardware specific init*.rc files
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

12 years agoMerge "core/Makefile: also look for device/*/build/tasks"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:56 +0000 (12:58 -0700)]
Merge "core/Makefile: also look for device/*/build/tasks"

12 years agoam 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the...
Scott Main [Wed, 8 Aug 2012 19:53:14 +0000 (12:53 -0700)]
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

12 years agoam c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width
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

12 years agoam 0e71cee2: 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

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 8 Aug 2012 15:15:40 +0000 (08:15 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I51e7a05d068725eb54c9cc38ab770707f7082c62

12 years agoJOO39
The Android Automerger [Wed, 8 Aug 2012 13:48:58 +0000 (06:48 -0700)]
JOO39

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoam 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 22:16:15 +0000 (15:16 -0700)]
am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '6bdeb4481e3e447d5234426a6c9cc74cbf103bab':
  JZO38

12 years agoam fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
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

12 years agoReconcile with jb-mr0-release - do not merge
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

12 years agodocs: make landing pages w/o image span the full page width
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

12 years agoJZO38
The Android Automerger [Tue, 7 Aug 2012 20:02:14 +0000 (13:02 -0700)]
JZO38

12 years agomerge in jb-mr0-release history after reset to jb-dev
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

12 years agoJOO38B
The Android Automerger [Tue, 7 Aug 2012 18:12:57 +0000 (11:12 -0700)]
JOO38B

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 7 Aug 2012 18:02:36 +0000 (11:02 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc

12 years agoJOO38
The Android Automerger [Tue, 7 Aug 2012 13:36:03 +0000 (06:36 -0700)]
JOO38

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoam aad5e32f: am fe50d923: am 9332a459: docs: comment-out unused style (the png curren...
Scott Main [Tue, 7 Aug 2012 02:00:09 +0000 (19:00 -0700)]
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)

12 years agoam fe50d923: am 9332a459: docs: comment-out unused style (the png currently does...
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)

12 years agoam 9332a459: 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)

12 years agodocs: 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

12 years agoam 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge
The Android Open Source Project [Mon, 6 Aug 2012 20:56:37 +0000 (13:56 -0700)]
am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge

* commit '8e3bf38977e2b46db4191d417568fe1c78efac14':
  JRO03O

12 years agoam 1210541b: (-s ours) Reconcile with jb-release - do not merge
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

12 years agoReconcile with jb-release - do not merge
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

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 6 Aug 2012 20:34:24 +0000 (13:34 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I94c2ae5ee6239ab6d058d0afabf896780bbbe838

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 6 Aug 2012 20:17:57 +0000 (13:17 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I78f2650f276afe5ec7b3c81baa7957b526de2569

12 years agoJOO37B
The Android Automerger [Mon, 6 Aug 2012 20:06:02 +0000 (13:06 -0700)]
JOO37B

12 years agoJRO03O
The Android Automerger [Mon, 6 Aug 2012 19:32:03 +0000 (12:32 -0700)]
JRO03O

12 years agoJOO37
The Android Automerger [Mon, 6 Aug 2012 13:30:31 +0000 (06:30 -0700)]
JOO37

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoam 7f9db64d: Merge "Add libstagefright and libstagefright_chromium_http to core...
Ying Wang [Sat, 4 Aug 2012 00:48:49 +0000 (17:48 -0700)]
am 7f9db64d: Merge "Add libstagefright and  libstagefright_chromium_http to core.mk." into jb-mr1-dev

* commit '7f9db64d0eaf69b362dd7bcdf9a0ce30562efe29':
  Add libstagefright and  libstagefright_chromium_http to core.mk.

12 years agoMerge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb...
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

12 years agoAdd libstagefright and libstagefright_chromium_http to core.mk.
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

12 years agoJOO33C
The Android Automerger [Fri, 3 Aug 2012 22:01:00 +0000 (15:01 -0700)]
JOO33C

12 years agoam acf206bc: Merge "Add imap2 to the build" into jb-mr1-dev
Paul Westbrook [Fri, 3 Aug 2012 21:22:49 +0000 (14:22 -0700)]
am acf206bc: Merge "Add imap2 to the build" into jb-mr1-dev

* commit 'acf206bc5eb78b432d19b3f200d9d6e3ff8e4361':
  Add imap2 to the build

12 years agoMerge "Add imap2 to the build" into jb-mr1-dev
Paul Westbrook [Fri, 3 Aug 2012 21:21:56 +0000 (14:21 -0700)]
Merge "Add imap2 to the build" into jb-mr1-dev

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 3 Aug 2012 20:56:03 +0000 (13:56 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Id99c83537b1e0ddbfb2f2b8b2b0cfc131df12fe4

12 years agoam fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge
The Android Open Source Project [Fri, 3 Aug 2012 20:26:49 +0000 (13:26 -0700)]
am fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'fa3c2d9a766202c026e2856ec9111b69a06c6f4c':
  JRO03L
  JRO03K
  JRO03J
  JRO03I

12 years agoam ad808f5d: (-s ours) Reconcile with jb-release - do not merge
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

12 years agoReconcile with jb-release - do not merge
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

12 years agoReconcile AOSP and GOOG jb-release
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

12 years agoAdd imap2 to the build
Paul Westbrook [Fri, 3 Aug 2012 18:46:02 +0000 (11:46 -0700)]
Add imap2 to the build

Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99

12 years agoJRO03L
The Android Automerger [Thu, 26 Jul 2012 23:06:25 +0000 (16:06 -0700)]
JRO03L

12 years agoJRO03K
The Android Automerger [Wed, 25 Jul 2012 20:54:38 +0000 (13:54 -0700)]
JRO03K

12 years agoJRO03J
The Android Automerger [Wed, 25 Jul 2012 03:31:56 +0000 (20:31 -0700)]
JRO03J

Change-Id: Ie86b38cf882d6acf5f3569f3286c9a9913918d43

12 years agoJRO03I
The Android Automerger [Wed, 25 Jul 2012 01:36:24 +0000 (18:36 -0700)]
JRO03I

12 years agoJOO33B take two
The Android Automerger [Fri, 3 Aug 2012 14:37:30 +0000 (07:37 -0700)]
JOO33B take two

12 years agoam c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported.
Shih-wei Liao [Fri, 3 Aug 2012 12:36:16 +0000 (05:36 -0700)]
am c814bcef: Fix build: After merging in Clang, -Wno-psabi is no longer supported.

* commit 'c814bcefd7ff65cbc91b66fb67a038fbd6ec9944':
  Fix build: After merging in Clang, -Wno-psabi is no longer supported.

12 years agoFix build: After merging in Clang, -Wno-psabi is no longer supported.
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

12 years agoadd extra args to mkbootimg
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

12 years agoJOO33B
The Android Automerger [Fri, 3 Aug 2012 02:03:27 +0000 (19:03 -0700)]
JOO33B

12 years agoam 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev
Doug Zongker [Thu, 2 Aug 2012 22:07:50 +0000 (15:07 -0700)]
am 1e845d33: Merge "add extra args to mkbootimg" into jb-mr1-dev

* commit '1e845d33af68673f0a6712c9c22dc2c37eebbc9d':
  add extra args to mkbootimg

12 years agoMerge "add extra args to mkbootimg" into jb-mr1-dev
Doug Zongker [Thu, 2 Aug 2012 22:06:10 +0000 (15:06 -0700)]
Merge "add extra args to mkbootimg" into jb-mr1-dev

12 years agoadd extra args to mkbootimg
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

12 years agoam 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
Keun young Park [Thu, 2 Aug 2012 21:56:37 +0000 (14:56 -0700)]
am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

* commit '15b2b0f711a824f4e4e8b72584b1fb8d19b3f123':
  keep PLATFORM_ZIP specified explicitly

12 years agoMerge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
Keun young Park [Thu, 2 Aug 2012 21:29:05 +0000 (14:29 -0700)]
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

12 years agoJOO33 take two
The Android Automerger [Thu, 2 Aug 2012 20:00:44 +0000 (13:00 -0700)]
JOO33 take two

12 years agokeep PLATFORM_ZIP specified explicitly
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

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 2 Aug 2012 18:26:09 +0000 (11:26 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: If85f28cdbccda3f78297d611fb01a38ee310e208

12 years agoJOO33
The Android Automerger [Thu, 2 Aug 2012 15:18:45 +0000 (08:18 -0700)]
JOO33

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoJOO32C
The Android Automerger [Thu, 2 Aug 2012 14:06:08 +0000 (07:06 -0700)]
JOO32C

12 years agoJOO33
The Android Automerger [Thu, 2 Aug 2012 14:00:53 +0000 (07:00 -0700)]
JOO33

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoam cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 22:40:44 +0000 (15:40 -0700)]
am cdbf0292: Merge "add missing telephony libs for PDK mini config" into jb-mr1-dev

* commit 'cdbf0292e435b46c764c19cba956b5f2e0d70751':
  add missing telephony libs for PDK mini config

12 years agoMerge "add missing telephony libs for PDK mini config" into 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

12 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 1 Aug 2012 22:13:27 +0000 (15:13 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I80d33df61bb9c1f1293c71d1d01a1e510e2ce693

12 years agoadd missing telephony libs for PDK mini config
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

12 years agoam f5bd3bce: am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c...
Roman Nurik [Wed, 1 Aug 2012 21:52:39 +0000 (14:52 -0700)]
am f5bd3bce: am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev

* commit 'f5bd3bce6706a8662827e037337fb84608d9b67f':
  Improve print stylesheet for d.a.c.

12 years agoam fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev
Keun young Park [Wed, 1 Aug 2012 21:49:45 +0000 (14:49 -0700)]
am fad81e89: Merge "add symbol files to PDK release for debugging" into jb-mr1-dev

* commit 'fad81e8997ad73d805f903a656347bcc863b69f5':
  add symbol files to PDK release for debugging

12 years agoam 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
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.

12 years agoMerge "add symbol files to PDK release for debugging" into jb-mr1-dev
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

12 years agoadd symbol files to PDK release for debugging
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

12 years agoam c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev
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.