Commit Graph

987 Commits

Author SHA1 Message Date
Colin Cross
dca1ac1325 Allow CustomizeProperties to override linker
am: 522e373a22

Change-Id: I4f95107fd19963712302fbf753a7c093c89df547
2016-09-07 21:15:43 +00:00
Colin Cross
522e373a22 Allow CustomizeProperties to override linker
Allow CustomizeProperties to override the dynamic linker by setting a
DynamicLinker property.  Needed by art, which overrides the linker for
device-on-host testing.

Change-Id: Ia4cb5a85b9a995d8138da33eb13543addf3b38cc
2016-09-07 13:14:06 -07:00
Colin Cross
5b25ba18ec Merge "Extend multilib"
am: 1e8ed27de3

Change-Id: Ibdc7fc197e753c11ae3c8a1444dd7ac8f72789c9
2016-09-07 00:34:15 +00:00
Colin Cross
1e8ed27de3 Merge "Extend multilib" 2016-09-07 00:26:02 +00:00
Nikola Veljkovic
3daec3e3e4 Merge "[mips] Disable compact branch generation"
am: ca06cc331d

Change-Id: Iaa61b99c0aaa686922c32d7f6dfdbc749f66cb86
2016-09-06 22:36:47 +00:00
Treehugger Robot
ca06cc331d Merge "[mips] Disable compact branch generation" 2016-09-06 22:30:59 +00:00
Nikola Veljkovic
3d6a38d601 [mips] Disable compact branch generation
Bug: http://b/31317834

Clang generates invalid beqc compact branch instruction. Disable
compact branch generation until clang is updated to include r278824,
which fixes the issue.

Error:
/tmp/backtrace_test-6a4a4f.s:6603: Error: invalid operands
`beqc $zero,$1,$BB31_ 6' clang++.real: error: assembler command
failed with exit code 1 (use -v to see in vocation)

Test for mips and mips64: cd system/core/libbacktrace && mma
Change-Id: I0b0f189e126621dbadb317ba711993e45004348d
2016-09-06 21:38:24 +00:00
Colin Cross
69617d3b7d Extend multilib
Allow multilib to be set to "prefer32", which will compile as 32-bit if
available, otherwise as 64-bit.

Add target.device.compile_multilib and target.host.compile_multilib.  If
set, they override the top-level compile_multlib property.

Change-Id: If658a035b5f441547bc74526feb1d34f773776ff
2016-09-06 13:26:37 -07:00
Colin Cross
7d168a39dd Remove HostPrefer32BitExecutables
am: 20780c80a0

Change-Id: I266fe091cb8f32bfeac8558adb44c3e254914ca3
2016-09-03 00:35:54 +00:00
Colin Cross
20780c80a0 Remove HostPrefer32BitExecutables
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.

Change-Id: I7c2db269d3f7fa1f4e0c022cbced789755a62d81
2016-09-02 14:06:30 -07:00
Dan Willemsen
afe1c9c495 Merge "Add InstallerProperties to cc_defaults"
am: 72301d978a

Change-Id: Ie1e87f0eed08fe2dce2ec65bfec11eed7ad02ac2
2016-09-01 21:51:54 +00:00
Treehugger Robot
72301d978a Merge "Add InstallerProperties to cc_defaults" 2016-09-01 21:45:56 +00:00
Josh Gao
7ae9e32ad4 Merge "Allow darwin targets to use -framework CoreFoundation."
am: 1c0ee4ab6e

Change-Id: I415f2263c2e8b1e7c39216289055dde2d0e21663
2016-09-01 21:30:23 +00:00
Josh Gao
1c0ee4ab6e Merge "Allow darwin targets to use -framework CoreFoundation." 2016-09-01 21:19:07 +00:00
Dan Willemsen
7424d61c95 Add InstallerProperties to cc_defaults
Test: Add relative_install_path to a cc_defaults
Change-Id: Id10f78afb3b82117b944b9b53fe7020fb672925b
2016-09-01 13:45:39 -07:00
Josh Gao
92da2b5e99 Allow darwin targets to use -framework CoreFoundation.
Bug: http://b/31245118
Change-Id: I5aa6162715b643af4a3073e6e403a6e1729f7c15
2016-09-01 11:53:42 -07:00
Dan Willemsen
2c78d4736e Support shared cc_test_library
am: 28bda51400

Change-Id: I54e1ca625067260dd670c33d86b9de1980b62854
2016-09-01 01:35:42 +00:00
Dan Willemsen
28bda51400 Support shared cc_test_library
So that shared libraries can be installed under /data/nativetest[64] (or
the host equivalent)

Change-Id: I41b2860365985f36828bd4bf9b6dc651b210822c
2016-08-31 16:32:55 -07:00
Colin Cross
cd26e259ec Enable goma in soong
am: 9d45bb78c5

Change-Id: Iaea9b028d5b1ee2765b36687733a55f8102581a3
2016-08-31 20:18:52 +00:00
Colin Cross
9d45bb78c5 Enable goma in soong
When the UseGoma flag is set, put all rules except the C compilation
rule in an externally defined local_pool, which will have been created
by kati.  The gomacc wrapper will already be in the CC_WRAPPER
environment variable.

Bug: 31142427
Change-Id: I699d4edff2e302eee398dad8692ceb14721a628c
2016-08-31 09:48:08 -07:00
Dan Willemsen
dc40771dbb Merge "Simplify bootstrapping"
am: 3cfaba1654

Change-Id: I2f1b45cbbe129e96c8c3081efca214290c82c51b
2016-08-31 16:11:43 +00:00
Dan Willemsen
3cfaba1654 Merge "Simplify bootstrapping" 2016-08-31 16:06:35 +00:00
Dan Willemsen
79d2f256d4 Simplify bootstrapping
Follow changes from https://github.com/google/blueprint/pull/121

Change-Id: Icc5003f6e8592a667e1ce5e58361c03997078763
2016-08-31 01:20:29 -07:00
Colin Cross
24c6e7d13a Merge "Add CC_WRAPPER support"
am: ecc53306b8

Change-Id: Ie7be738ad1d326b046344d96cab84172118fe7f5
2016-08-30 19:42:25 +00:00
Colin Cross
ecc53306b8 Merge "Add CC_WRAPPER support" 2016-08-30 19:34:01 +00:00
Dan Willemsen
909ff131ae Merge "Expose module suffixes to Make"
am: 8be0e0ffde

Change-Id: I95735fa9a4a8fcf8e6cf069d043175667de8fb2f
2016-08-30 02:23:57 +00:00
Treehugger Robot
8be0e0ffde Merge "Expose module suffixes to Make" 2016-08-30 02:10:52 +00:00
Dan Willemsen
c3a6082769 Merge "Add frameworks/av to root.bp"
am: 5710e770ea

Change-Id: I1d7416bd021d08f454e76aa43bf6c4e052039e12
2016-08-29 23:44:30 +00:00
Dan Willemsen
5710e770ea Merge "Add frameworks/av to root.bp" 2016-08-29 23:25:57 +00:00
Dan Willemsen
1d577e25a7 Expose module suffixes to Make
These had only been exposed for shared libraries.

Also fixes testDecorator to not have two baseInstallers both being
written out to the Android.mk.

Bug: 31158868
Test: manual diff of out/soong/Android-aosp_flounder.mk
Test: Verify installed windows binaries end in .exe
Change-Id: I2bded5fb090117d48ade575b4438e0dedd2e3763
2016-08-29 16:02:05 -07:00
Colin Cross
d9b22d2173 Merge "Fix installation path for asan libraries"
am: 27807b5415

Change-Id: Ie30e9e5b8b884525bd88525eb9683afd6193ee9b
2016-08-29 22:35:21 +00:00
Dan Willemsen
f1f62a544a Merge "Move Android.bp definitions into subdirs"
am: 70595d1e95

Change-Id: I56387e73d15da0c0000b496056fa888e96a1d11a
2016-08-29 22:31:52 +00:00
Dan Willemsen
ddc0180380 Move Android.bp definitions into subdirs
am: 377737a01c

Change-Id: Iefe5a8e432c0c73b0935f04b2e6a620555685f33
2016-08-29 22:31:52 +00:00
Treehugger Robot
27807b5415 Merge "Fix installation path for asan libraries" 2016-08-29 22:29:16 +00:00
Treehugger Robot
70595d1e95 Merge "Move Android.bp definitions into subdirs" 2016-08-29 22:13:12 +00:00
Colin Cross
9461040154 Fix installation path for asan libraries
Check c.sanitize.inData() when deciding on install paths.
Don't set inData() for sanitized binaries.

Bug: 30773053
Change-Id: I24be75ccc1b25ae53f7f0a98d1632b30735d0931
2016-08-29 13:50:24 -07:00
Alistair Strachan
777475cb48 Add CC_WRAPPER support
Change-Id: If252c41ec1e3d708f599990c72be69dc8117ae14
2016-08-29 20:39:32 +00:00
Pirama Arumuga Nainar
1e61d9d964 Switch to prebuilt clang-3217047
am: 15690c02d6

Change-Id: I771cb6e1bc8205a013c10cdfd05a9abc0b559a07
2016-08-29 19:55:42 +00:00
Dan Willemsen
085a8cdeb5 Add frameworks/av to root.bp
Change-Id: Id1867ba1be12b4ddee0e5d9a23e6bbd2c2699b7f
2016-08-26 17:52:06 -07:00
Pirama Arumuga Nainar
15690c02d6 Switch to prebuilt clang-3217047
Bug: http://b/30421084
Change-Id: I8b65669ef9f60f85202295de117d3806d3a5b1f6
Test: Tested build, boot and common usage for several devices in AOSP
and internal branch.
2016-08-26 21:54:54 +00:00
Colin Cross
290975ca78 Merge "Fix mac art build"
am: f5a50a8b17

Change-Id: Ie27ccc66e76e72a0f05cd24e8399fd4b20a72b05
2016-08-26 01:28:38 +00:00
Treehugger Robot
f5a50a8b17 Merge "Fix mac art build" 2016-08-26 01:22:07 +00:00
Colin Cross
c2c3500578 Add support for preferred arch symlinks
am: 1e7d3706d6

Change-Id: Ie6c8657ebed06270fcdfc78fae952be0a7371ece
2016-08-26 00:06:09 +00:00
Colin Cross
7d82ab76dd Fix mac art build
-Wl,-read_only_relocs,suppress is required for libart to build to
avoid the error:
ld: illegal text-relocation to '__ZN3art7Runtime9instance_E' in out/soong/.intermediates/art/runtime/libart/darwin_x86_static/obj/art/runtime/runtime.o from '_art_quick_throw_null_pointer_exception' in out/soong/.intermediates/art/runtime/libart/darwin_x86_static/obj/art/runtime/arch/x86/quick_entrypoints_x86.o for architecture i386

Change-Id: Id9a0fda1dbf12a254f92419a21e5f290895ea62c
2016-08-25 16:54:53 -07:00
Dan Willemsen
377737a01c Move Android.bp definitions into subdirs
Test: m blueprint_tools still produces the same tools
Change-Id: Ia1e2e43c62cb6035616bef9fbef56417b46cf3a4
2016-08-25 15:50:21 -07:00
Colin Cross
1e7d3706d6 Add support for preferred arch symlinks
Add a symlink_preferred_arch property to binaries to allow compiling the
binary for multiple architectures and then creating a symlink to the
preferred archicture, for example dalvikvm32 and dalvikvm64, with
dalvikvm symlinked to dalvikvm64.

Test: mmma -j art/dalvikvm
Change-Id: Ied15f2be9d52c01006fe8ac207c175b78558eab1
2016-08-25 22:42:02 +00:00
Colin Cross
669ef7c13b Add art
am: 0f4e0d6c5d

Change-Id: I6ce9d9b328b0c8b401a299c6f25834fbee93c86a
2016-08-25 22:35:25 +00:00
Colin Cross
0f4e0d6c5d Add art
Re-land I557c86d2282178d215ea17abb71e556bdc4ba722

Change-Id: Ic26e1a6b17569acbfe68b4a219982ce45cecefbd
2016-08-25 14:00:25 -07:00
Colin Cross
2095599791 Merge "Revert "Add art""
am: d46b39d356

Change-Id: I4531faaa5a243f7237c26a4f66484932f76bf84a
2016-08-25 01:12:59 +00:00
Colin Cross
d46b39d356 Merge "Revert "Add art"" 2016-08-25 01:05:27 +00:00