Nick Kralevich
1b3914f595
am 62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
...
* commit '62481e30f331c09aed4270cbd6ee87b7a6baeb6e':
arm: add --warn-shared-textrel
2012-08-10 14:13:00 -07:00
Nick Kralevich
62481e30f3
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
2012-08-10 14:11:14 -07:00
Nick Kralevich
b238210c01
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
2012-08-10 13:05:53 -07:00
Jean-Baptiste Queru
224f28a845
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
2012-08-10 12:46:31 -07:00
Jean-Baptiste Queru
8e175c8a99
am c244634e: am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."
...
* commit 'c244634e8f9b89a652dc82df1e8f803d01b61509':
Support for MIPS Build targets.
2012-08-10 12:46:29 -07:00
Jean-Baptiste Queru
049d97d778
am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
2012-08-10 12:43:59 -07:00
Jean-Baptiste Queru
84d4afa66e
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
2012-08-10 12:43:59 -07:00
Jean-Baptiste Queru
c244634e8f
am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."
...
* commit '64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
2012-08-10 12:43:58 -07:00
Jean-Baptiste Queru
91afae6c03
resolved conflicts for merge of dd14acc3
to jb-mr1-dev
...
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
2012-08-10 12:42:18 -07:00
The Android Open Source Project
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
The Android Open Source Project
baa9701214
am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
2012-08-10 12:36:39 -07:00
Jean-Baptiste Queru
2387857dad
am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
64b8c6e936
am 6e6d92c4: Merge "Support for MIPS Build targets."
...
* commit '6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
2012-08-10 09:23:39 -07:00
Jean-Baptiste Queru
dd14acc3f6
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
2012-08-10 09:23:38 -07:00
Jean-Baptiste Queru
968f20a4c2
Merge "MIPS support to *.mk files and envsetup.sh"
2012-08-10 09:16:20 -07:00
Raghu Gandham
8da4310646
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>
2012-08-10 09:15:38 -07:00
The Android Open Source Project
8e1a875335
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5
2012-08-10 08:51:46 -07:00
Jean-Baptiste Queru
6e6d92c47a
Merge "Support for MIPS Build targets."
2012-08-10 08:39:34 -07:00
Jean-Baptiste Queru
e443a9e92f
Merge "Modify full_mips-eng build in line with the full-eng build"
2012-08-10 08:39:10 -07:00
The Android Open Source Project
d4c6a2edde
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41
2012-08-10 08:33:53 -07:00
The Android Automerger
d1dc01c4a3
JOO40B
2012-08-09 16:02:33 -07:00
Kenny Root
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
Kenny Root
c2872a6240
Merge "Add make_ext4fs to all builds" into jb-mr1-dev
2012-08-09 13:03:10 -07:00
Doug Zongker
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
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
The Android Automerger
951f93e91e
JZO40
2012-08-09 11:37:32 -07:00
The Android Automerger
9a031b9e79
merge in jb-mr0-release history after reset to jb-dev
2012-08-09 11:36:36 -07:00
The Android Automerger
cd6afb8c4c
JOO40
2012-08-09 09:30:20 -07:00
The Android Automerger
30f516b4ae
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:42 -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
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
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
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
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
The Android Automerger
229dad6d21
JOO39B
2012-08-08 15:06:55 -07:00
Jean-Baptiste Queru
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
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
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
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
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
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
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
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