OSDN Git Service
The Android Open Source Project [Wed, 15 Aug 2012 15:06:43 +0000 (08:06 -0700)]
am
0062f811: am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
0062f811c0727e329bf96a75876a99e661419d0f':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)]
am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
The Android Open Source Project [Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
Scott Main [Wed, 15 Aug 2012 01:13:24 +0000 (18:13 -0700)]
am
d3ee366a: am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
d3ee366af2ce12093478c35b14a1160599b27f71':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:12:02 +0000 (18:12 -0700)]
am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
021ff2ee388bdb548ae55b349535d14e0423207c':
docs: move home.css into default.css to reduce number of requests
Scott Main [Wed, 15 Aug 2012 01:10:52 +0000 (18:10 -0700)]
am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
docs: move home.css into default.css to reduce number of requests
Doug Zongker [Tue, 14 Aug 2012 23:51:40 +0000 (16:51 -0700)]
am
24cd2803: allow diff program to be selected explicitly
* commit '
24cd28032890b1ca7fbc34320a22bd575f59d641':
allow diff program to be selected explicitly
Doug Zongker [Tue, 14 Aug 2012 23:36:15 +0000 (16:36 -0700)]
allow diff program to be selected explicitly
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
Scott Main [Tue, 14 Aug 2012 22:04:40 +0000 (15:04 -0700)]
docs: move home.css into default.css to reduce number of requests
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
Jesse Hall [Tue, 14 Aug 2012 22:33:05 +0000 (15:33 -0700)]
am
8513b62f: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
* commit '
8513b62f6acda50db9afc3194165488c44819dd2':
Include FusedLocation.apk on sdk builds too
Jesse Hall [Tue, 14 Aug 2012 22:31:42 +0000 (15:31 -0700)]
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
Jesse Hall [Tue, 14 Aug 2012 20:34:10 +0000 (13:34 -0700)]
Include FusedLocation.apk on sdk builds too
Bug:
6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
Ying Wang [Tue, 14 Aug 2012 20:09:19 +0000 (13:09 -0700)]
am
27d51bf6: Force out LOCAL_NDK_VERSION.
* commit '
27d51bf6d3cd4189085238503d46a5a570173e1b':
Force out LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 18:08:03 +0000 (11:08 -0700)]
Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
Ying Wang [Tue, 14 Aug 2012 19:13:15 +0000 (12:13 -0700)]
am
54fdb473: Retire LOCAL_NDK_VERSION.
* commit '
54fdb473b656544c75ad06497ecf20a1e8d6b539':
Retire LOCAL_NDK_VERSION.
Ying Wang [Tue, 14 Aug 2012 18:58:53 +0000 (11:58 -0700)]
am
d4f0ffcb: Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
* commit '
d4f0ffcb6b30c96160667d1757edb9d3692caba8':
Adopt the new prebuilts/ndk/<number> paths.
Ying Wang [Tue, 14 Aug 2012 17:13:16 +0000 (10:13 -0700)]
Retire LOCAL_NDK_VERSION.
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.
Bug:
6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:57:19 +0000 (11:57 -0700)]
am
1196c824: am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
1196c82491e29eed257a44aa7384d8b836657b82':
Set the AOSP master to be API level 16
Ying Wang [Tue, 14 Aug 2012 18:57:01 +0000 (11:57 -0700)]
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
Ying Wang [Fri, 10 Aug 2012 17:57:37 +0000 (10:57 -0700)]
Adopt the new prebuilts/ndk/<number> paths.
Bug:
6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:55:19 +0000 (11:55 -0700)]
am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:53:40 +0000 (11:53 -0700)]
am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set the AOSP master to be API level 16"
Jean-Baptiste Queru [Tue, 14 Aug 2012 16:07:33 +0000 (09:07 -0700)]
Set the AOSP master to be API level 16
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
Ying Wang [Mon, 13 Aug 2012 23:27:07 +0000 (16:27 -0700)]
am
f59a64b7: am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
f59a64b7cba7330701b8791698e67abff8afde65':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)]
am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
d3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
Ying Wang [Mon, 13 Aug 2012 23:24:11 +0000 (16:24 -0700)]
am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
The Android Automerger [Mon, 13 Aug 2012 23:07:45 +0000 (16:07 -0700)]
JRO03P
Ying Wang [Mon, 13 Aug 2012 23:05:37 +0000 (16:05 -0700)]
am
4150db69: am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
4150db6905a1a72ed7f400556e89c39054700518':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 23:03:29 +0000 (16:03 -0700)]
am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
d7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 22:41:12 +0000 (15:41 -0700)]
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
Ying Wang [Mon, 13 Aug 2012 22:03:00 +0000 (15:03 -0700)]
Move the selinux modules to core PRODUCT_PACKAGES
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.
Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
Ying Wang [Mon, 13 Aug 2012 22:17:45 +0000 (15:17 -0700)]
am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 21:52:24 +0000 (14:52 -0700)]
Merge "Add mac_permissions.xml dependency."
Elliott Hughes [Sat, 11 Aug 2012 22:16:31 +0000 (15:16 -0700)]
am
880d3f39: resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
* commit '
880d3f39f711f9ca6d2ba5c9cf127265fa39efad':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 19:00:51 +0000 (12:00 -0700)]
resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
Change-Id: I0978f511f807797f89be4002bca654492231761c
Elliott Hughes [Sat, 11 Aug 2012 18:51:39 +0000 (11:51 -0700)]
am
20e713d1: Merge "Remove TARGET_linux-sh.mk."
* commit '
20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove TARGET_linux-sh.mk."
Nick Pelly [Sat, 11 Aug 2012 01:56:43 +0000 (18:56 -0700)]
am
0de821b0: Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
* commit '
0de821b0b10bbf3404827f21bfa9a2489d7358c5':
Include FusedLocation.apk on all builds.
Nick Pelly [Sat, 11 Aug 2012 01:54:22 +0000 (18:54 -0700)]
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
Nick Pelly [Sat, 11 Aug 2012 01:50:36 +0000 (18:50 -0700)]
Include FusedLocation.apk on all builds.
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
Guang Zhu [Sat, 11 Aug 2012 01:46:31 +0000 (18:46 -0700)]
am
62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
* commit '
62f034792d560055c80834981ebffeb3bfa9db39':
Use new flag for emma instrumented build and limit to apps only
Guang Zhu [Sat, 11 Aug 2012 01:44:42 +0000 (18:44 -0700)]
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
Keun young Park [Sat, 11 Aug 2012 01:28:56 +0000 (18:28 -0700)]
am
f15a11c5: add libstagefright_chromium_http to mini for streaming
* commit '
f15a11c58ddb7343ba89298bc45f264f19755fec':
add libstagefright_chromium_http to mini for streaming
Keun young Park [Fri, 10 Aug 2012 23:59:54 +0000 (16:59 -0700)]
add libstagefright_chromium_http to mini for streaming
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
Elliott Hughes [Fri, 10 Aug 2012 22:36:51 +0000 (15:36 -0700)]
Remove TARGET_linux-sh.mk.
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
Nick Kralevich [Fri, 10 Aug 2012 21:13:00 +0000 (14:13 -0700)]
am
62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
* commit '
62481e30f331c09aed4270cbd6ee87b7a6baeb6e':
arm: add --warn-shared-textrel
Nick Kralevich [Fri, 10 Aug 2012 21:11:14 +0000 (14:11 -0700)]
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
Nick Kralevich [Fri, 10 Aug 2012 19:51:26 +0000 (12:51 -0700)]
arm: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
References: http://www.akkadia.org/drepper/textrelocs.html
Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:31 +0000 (12:46 -0700)]
am
049d97d7: am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
049d97d7789a9fa29845effb3323203be36e3f97':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:46:29 +0000 (12:46 -0700)]
am
c244634e: am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
c244634e8f9b89a652dc82df1e8f803d01b61509':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
91afae6c: resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
* commit '
91afae6c039d06df83d708834c96d47858406e2a':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:58 +0000 (12:43 -0700)]
am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)]
resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
The Android Open Source Project [Fri, 10 Aug 2012 19:40:20 +0000 (12:40 -0700)]
am
baa97012: am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
baa97012143a8601aff04428a179446d8182a4a4':
JZO40
The Android Open Source Project [Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)]
am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:42 +0000 (09:23 -0700)]
am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:39 +0000 (09:23 -0700)]
am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:38 +0000 (09:23 -0700)]
am
e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit '
e443a9e92f323bff5bb304e1baf8b00ed18888be':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:16:20 +0000 (09:16 -0700)]
Merge "MIPS support to *.mk files and envsetup.sh"
Raghu Gandham [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
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
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:33 +0000 (08:39 -0700)]
Merge "Support for MIPS Build targets."
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:09 +0000 (08:39 -0700)]
Merge "Modify full_mips-eng build in line with the full-eng build"
The Android Open Source Project [Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41
The Android Automerger [Thu, 9 Aug 2012 23:02:33 +0000 (16:02 -0700)]
JOO40B
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
Kenny Root [Thu, 9 Aug 2012 20:03:10 +0000 (13:03 -0700)]
Merge "Add make_ext4fs to all builds" into jb-mr1-dev
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
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
The Android Automerger [Thu, 9 Aug 2012 18:37:32 +0000 (11:37 -0700)]
JZO40
The Android Automerger [Thu, 9 Aug 2012 18:36:36 +0000 (11:36 -0700)]
merge in jb-mr0-release history after reset to jb-dev
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
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
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
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
Guang Zhu [Mon, 6 Aug 2012 23:11:05 +0000 (16:11 -0700)]
Use new flag for emma instrumented build and limit to apps only
Based on existing setup, when EMMA_INSTRUMENT is used on a full
build, all Java modules will be processed with emma instrument
unless otherwise marked in their own Makefiles.
For the purpose of collecting code coverage, emma-instrument
all Java modules aren't that useful, instead, instrumenting all
the app packages is more useful. This change adds a new flag
EMMA_FULL_APP_INSTRUMENT, which can be used with a full build
to instrument all app packages.
Change-Id: Ie143fed49c23402b21f6cccac2ef25741726be45
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.
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:09:09 +0000 (14:09 -0700)]
am
b0cc9aae: am
35b24a82: am
8776f34a: Merge "x86: cleanups for toolchain"
* commit '
b0cc9aae50089f0b77d6adc74f4d6027f0316b52':
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
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: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
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: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
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: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
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 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
The Android Automerger [Wed, 8 Aug 2012 13:48:58 +0000 (06:48 -0700)]
JOO39