Commit Graph

15500 Commits

Author SHA1 Message Date
Brian Carlstrom 03e1caed18 Make libart the default runtime
(cherry picked from commit 08d410f532)

Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
2014-01-28 17:41:40 -08:00
Elliott Hughes b058eeae6a am bc528c22: am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit 'bc528c22b8225e539165f5c86ea0256e57cc7206':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:54:46 +00:00
Elliott Hughes bc528c22b8 am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:37:15 +00:00
Elliott Hughes f7784e4617 am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:35:25 +00:00
Elliott Hughes 1a0e850141 am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:29:52 +00:00
Elliott Hughes 1a731adf94 Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 2014-01-28 21:23:07 +00:00
Brian Carlstrom c5151cf0ec resolved conflicts for merge of 1737b1ab to master
Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
2014-01-28 13:10:27 -08:00
Elliott Hughes 171e940c7a Fix KERNEL_HEADERS_ARCH for mips and x86.
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)

Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
2014-01-28 13:10:19 -08:00
Brian Carlstrom 1737b1ab5f am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:54:10 +00:00
Brian Carlstrom dc5dd9b47f am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:52:17 +00:00
Brian Carlstrom d3737d07c8 am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '49eb440980db6680ec08c48b416e37e937bf9003':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:50:19 +00:00
Brian Carlstrom 49eb440980 Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 2014-01-28 20:45:32 +00:00
Brian Carlstrom 8fb5dfc5c7 build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)

Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
2014-01-28 11:29:58 -08:00
Colin Cross ed9f6bb384 am 23710e27: am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '23710e27bc23bb32dc99f35ec0c31e4185586ec0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:40:00 +00:00
Colin Cross 23710e27bc am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit 'cb1ad445663d190e204330b596b52e4734d9dcf0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:37:21 +00:00
Colin Cross cb1ad44566 am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '0d24616dd1b29e016aaae86761574fd88d701b6d':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:34:05 +00:00
Colin Cross 0d24616dd1 am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:31:18 +00:00
Colin Cross cdd1475834 Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 2014-01-28 02:25:45 +00:00
Colin Cross 8f47fc379e Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support.  These will be
filtered out of the cflags provided by the module.

Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.

Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
2014-01-27 18:21:12 -08:00
Elliott Hughes d63d974c49 am 6fe9a949: am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
  Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00:00
Elliott Hughes 6fe9a94989 am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00:00
Elliott Hughes 69c36ee7a8 am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
  Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes 4fbf23ef82 am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
  Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Ying Wang eb18125f2f am 0064dceb: am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
* commit '0064dceb198788e237bbc10931c54b9a35275976':
  ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:13:04 +00:00
Ying Wang 0064dceb19 am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
* commit 'a8d15474ebb7b595f842ffb23a36cce9bc382f10':
  ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:08:19 +00:00
Ying Wang a8d15474eb am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
* commit '04cff70804810d27e1fcbef556ebfdc39278d746':
  ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:00:50 +00:00
Elliott Hughes 0a3cf1a0e5 Merge "Remove libthread_db from the default include path." 2014-01-28 00:00:19 +00:00
Ying Wang 04cff70804 resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
2014-01-27 15:56:45 -08:00
Colin Cross 40826c170c am 8c89a9ff: am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:48:52 +00:00
Colin Cross 8c89a9ff9c am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '4695598df1fa11064a54421f60fee66032c673ee':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:46:39 +00:00
Ying Wang 5742ae4cc7 am 3e3a56ad: am ae1c7d96: am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '3e3a56adf27ac9a7dd9690f78af05814e9784e67':
  Don't modify LOCAL_MODULE_TAGS.
2014-01-27 23:45:28 +00:00
Elliott Hughes 2f8dcdd961 Remove libthread_db from the default include path.
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross 4695598df1 am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit 'ae49acbde766e2e683d3dd026e69f2416da766b1':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:43:33 +00:00
Ying Wang 3e3a56adf2 am ae1c7d96: am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit 'ae1c7d960715ec90afa4accf0754f176d088a30f':
  Don't modify LOCAL_MODULE_TAGS.
2014-01-27 23:42:11 +00:00
Colin Cross ae49acbde7 am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '1acb1b64b9be43503fa2a9949858b8bb36417e32':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 15:40:22 -08:00
Ying Wang 7382ec7db8 Merge "ota_from_target_files: Add an option to not sign OTA packages" 2014-01-27 23:37:18 +00:00
Colin Cross 1acb1b64b9 Merge changes I62504bad,I16208cca,I4e4ceec6
* changes:
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:35:01 +00:00
Ying Wang ae1c7d9607 am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
  Don't modify LOCAL_MODULE_TAGS.
2014-01-27 23:32:44 +00:00
Ying Wang 50c548c8f4 am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '25a16fe80ee7795c4763045061779f3c7068813d':
  Don't modify LOCAL_MODULE_TAGS.
2014-01-27 15:25:35 -08:00
Ying Wang 25a16fe80e Merge "Don't modify LOCAL_MODULE_TAGS." 2014-01-27 23:20:06 +00:00
Ying Wang 37bd1f2d83 Don't modify LOCAL_MODULE_TAGS.
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
2014-01-27 15:19:09 -08:00
Ying Wang e99fbf04dd am 9f9204ec: am a4d70f94: am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '9f9204ec3aadfe7e4b54e52f560ed7c66f316891':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:09:10 +00:00
Ying Wang 9f9204ec3a am a4d70f94: am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit 'a4d70f9435764339695e9264ac5d815a894e1e9f':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:05:22 +00:00
Ying Wang a4d70f9435 am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '0105f1cc9aa2ea3c683c197b18747f5b04310c27':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:01:02 +00:00
Ying Wang 0105f1cc9a am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '07b16c0d5be77e53325a9f93c2f7f68632417792':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 14:57:57 -08:00
Ying Wang 07b16c0d5b Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 2014-01-27 22:52:14 +00:00
Colin Cross d826264621 add new gen/ directory for generated sources
Allow modules to generate source into $OUT/gen, which will then
be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as
necessary.  This allows a single build rule invocation that includes
generated source to build for the first and second architectures.

Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.

Change-Id: I62504bad9454b3d9fde7b84ab9f0a487a2ecf0bf
2014-01-27 14:45:44 -08:00
Colin Cross d0378b3f2d warn on LOCAL_MODULE_PATH in multiarch shared libraries
Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path.  Warn and suggest LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
2014-01-27 14:43:24 -08:00
Colin Cross 639c336dc1 Support LOCAL_MODULE_RELATIVE_PATH
Most users of LOCAL_MODULE_PATH are setting a subdirectory of the
normal install path, for example to install HALs into system/lib/hw.
This is problematic for multiarch builds, where the install location
depends on the arch.  Allow modules to specify LOCAL_MODULE_RELATIVE_PATH.
HALs will generally use:
LOCAL_MODULE_RELATIVE_PATH := hw

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
2014-01-27 14:43:14 -08:00
Andrew Boie f3ec9ed045 collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.

Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-01-27 12:25:43 -08:00