Commit Graph

2598 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2f32c04d8c am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"
* commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
  select.mk: Tune ccache options
2012-08-16 15:28:47 -07:00
Jean-Baptiste Queru
d77d8906b8 am 6020d698: Merge "select.mk: Tune ccache options"
* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
  select.mk: Tune ccache options
2012-08-16 15:27:54 -07:00
Jean-Baptiste Queru
6020d698f5 Merge "select.mk: Tune ccache options" 2012-08-16 14:55:26 -07:00
Andrew Boie
1f93043c86 select.mk: Tune ccache options
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-08-16 11:11:29 -07:00
Ying Wang
bc415dd5eb Support to build emmap_mata.zip in unbundled builds.
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
2012-08-16 10:10:11 -07:00
Elliott Hughes
a8352cac8d am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
  The zoneinfo stuff is no longer legacy.
2012-08-15 20:03:54 -07:00
Elliott Hughes
0fc8d635a7 am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
  The zoneinfo stuff is no longer legacy.
2012-08-15 20:02:49 -07:00
Elliott Hughes
f2a618e1df Merge "The zoneinfo stuff is no longer legacy." 2012-08-15 19:43:41 -07:00
Elliott Hughes
e1654eaccb The zoneinfo stuff is no longer legacy.
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
2012-08-15 18:34:49 -07:00
Keun young Park
a8811fda4f fix MIPS build
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
  not under TARGET_OUT_STATIC_LIBRARIES

Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
2012-08-15 13:42:37 -07:00
Iliyan Malchev
0016a9ba8d Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev 2012-08-15 09:18:12 -07:00
Iliyan Malchev
0854694c51 build: register BOARD_HAVE_BLUETOOTH_QCOM
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-15 08:12:06 -07:00
Ying Wang
27d51bf6d3 Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
2012-08-14 13:06:22 -07:00
Ying Wang
54fdb473b6 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
2012-08-14 11:58:13 -07:00
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
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
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
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
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
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
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
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
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
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