Ying Wang
d4f0ffcb6b
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
2012-08-14 11:57:01 -07:00
Ying Wang
7f8d0ba6bd
Adopt the new prebuilts/ndk/<number> paths.
...
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
2012-08-14 11:55:46 -07:00
Jean-Baptiste Queru
1196c82491
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
2012-08-14 11:55:19 -07:00
Jean-Baptiste Queru
7159a992dd
am 4eddad55
: Merge "Set the AOSP master to be API level 16"
...
* commit '4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
2012-08-14 11:53:40 -07:00
Jean-Baptiste Queru
4eddad550e
Merge "Set the AOSP master to be API level 16"
2012-08-14 10:51:21 -07:00
Jean-Baptiste Queru
e46e8603b2
Set the AOSP master to be API level 16
...
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
2012-08-14 09:07:33 -07:00
Ying Wang
f59a64b7cb
am d3d0beca
: am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:26:06 -07:00
Ying Wang
d3d0becac9
am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:24:11 -07:00
The Android Automerger
add1fb4607
JRO03P
2012-08-13 16:07:45 -07:00
Ying Wang
4150db6905
am d7547163
: am 679b7498
: Merge "Add mac_permissions.xml dependency."
...
* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
2012-08-13 16:03:29 -07:00
Ying Wang
392bdc1f08
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
2012-08-13 15:41:12 -07:00
Ying Wang
82ccebaa59
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
2012-08-13 15:40:43 -07:00
Ying Wang
d7547163d5
am 679b7498
: Merge "Add mac_permissions.xml dependency."
...
* commit '679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
2012-08-13 15:17:45 -07:00
Ying Wang
679b7498af
Merge "Add mac_permissions.xml dependency."
2012-08-13 14:52:24 -07:00
Elliott Hughes
880d3f39f7
resolved conflicts for merge of 0ac38a4e
to jb-mr1-dev
...
Change-Id: I0978f511f807797f89be4002bca654492231761c
2012-08-11 12:00:51 -07:00
Elliott Hughes
0ac38a4e5e
am 20e713d1
: Merge "Remove TARGET_linux-sh.mk."
...
* commit '20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
2012-08-11 11:51:39 -07:00
Elliott Hughes
20e713d151
Merge "Remove TARGET_linux-sh.mk."
2012-08-11 09:34:51 -07:00
Nick Pelly
0de821b0b1
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
2012-08-10 18:54:23 -07:00
Nick Pelly
48d55d3777
Include FusedLocation.apk on all builds.
...
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
2012-08-10 18:50:36 -07:00
Guang Zhu
62f034792d
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
2012-08-10 18:44:43 -07:00
Keun young Park
f15a11c58d
add libstagefright_chromium_http to mini for streaming
...
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
2012-08-10 16:59:54 -07:00
Elliott Hughes
5f6c7fd884
Remove TARGET_linux-sh.mk.
...
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
2012-08-10 15:36:51 -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
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
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
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
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
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
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
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
Guang Zhu
79f68bc925
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
2012-08-08 16:46:53 -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