Dan Willemsen
9cf8de2b89
Merge changes I8dd0f858,I15c17d0d am: dded092368
...
am: 6eb594b1a8
Change-Id: If22afda1f261ec8eef2fb0be15161ed5054ae14b
2016-09-14 02:11:19 +00:00
Dan Willemsen
e7aa1ce099
Add entries in root.bp for hidl/hwbinder am: 2c173ee03a
...
am: 8e14ae827b
Change-Id: I81a340200cd7ae26429ea9ac90a1e62b52ed405f
2016-09-14 02:11:18 +00:00
Dan Willemsen
b837f77565
Fix lex/yacc path am: 76ef5abd9a
...
am: def921651a
Change-Id: I803ea7ab2ec8f998ac5b860129f49d3a5fbaa1d4
2016-09-14 02:11:17 +00:00
Dan Willemsen
6eb594b1a8
Merge changes I8dd0f858,I15c17d0d
...
am: dded092368
Change-Id: I36ee62dccc823ecd8e6e6a53d88191e7e8c43a60
2016-09-14 02:08:49 +00:00
Dan Willemsen
8e14ae827b
Add entries in root.bp for hidl/hwbinder
...
am: 2c173ee03a
Change-Id: I44ddc67dcb21e3e6afedbac606cc53314ddaead7
2016-09-14 02:08:49 +00:00
Dan Willemsen
def921651a
Fix lex/yacc path
...
am: 76ef5abd9a
Change-Id: I3fbf277ffe374e5957942254e09ff212b77417c3
2016-09-14 02:08:48 +00:00
Treehugger Robot
dded092368
Merge changes I8dd0f858,I15c17d0d
...
* changes:
Add entries in root.bp for hidl/hwbinder
Fix lex/yacc path
2016-09-14 02:01:52 +00:00
Colin Cross
178a509855
Replace PropertyCustomizer with hooks
...
Replace PropertyCustomizer with a more extensible hooks mechanism.
Instead of passing an object that satisifies an interface, pass a
function pointer that takes a context interface as an argument. Callers
can use lambdas to capture any other necessary parameters like property
structs.
Also add two new hooks, arch hooks that occur after splitting modules
into arch variants, and install hooks that occur each time a file is
installed to the output directory.
Change-Id: I3a3e34aa97f1a92d3a31e5004b4b1ba68869d242
2016-09-13 17:37:32 -07:00
Colin Cross
f3ac0b8e97
Merge "Fix windows builds" am: 706ce019e2
am: b35ec87342
...
am: 1cde6f8688
Change-Id: I879ca8f2c63b84b7edfb9494cf989efb11b81a35
2016-09-14 00:17:40 +00:00
Colin Cross
1cde6f8688
Merge "Fix windows builds" am: 706ce019e2
...
am: b35ec87342
Change-Id: I1a450327e98ca951e45504cd18a00db046b53d11
2016-09-14 00:14:40 +00:00
Colin Cross
b35ec87342
Merge "Fix windows builds"
...
am: 706ce019e2
Change-Id: I09175d9afccbebb83be860844a58dff1947b61f7
2016-09-14 00:12:09 +00:00
Treehugger Robot
706ce019e2
Merge "Fix windows builds"
2016-09-14 00:02:17 +00:00
Dan Willemsen
2c173ee03a
Add entries in root.bp for hidl/hwbinder
...
Change-Id: I8dd0f8585dc8214c43983112bd6b8e109ac030af
2016-09-13 16:58:03 -07:00
Dan Willemsen
76ef5abd9a
Fix lex/yacc path
...
Test: It no longer panics when there is a .yy/.ll file to build
Change-Id: I15c17d0df9449eabbede5d8afef955156baaba3d
2016-09-13 16:57:15 -07:00
Colin Cross
79b9d5c019
Remove cc.Customizer am: b4ce0ecad6
am: c471ad53ff
...
am: 6e41798485
Change-Id: Ib4c65d606df3c40de0f1866e90bae2085bf33250
2016-09-13 22:57:23 +00:00
Colin Cross
6e41798485
Remove cc.Customizer am: b4ce0ecad6
...
am: c471ad53ff
Change-Id: I8bcc141525d794d8214739f8296ccdf033d0c12b
2016-09-13 22:54:22 +00:00
Colin Cross
c471ad53ff
Remove cc.Customizer
...
am: b4ce0ecad6
Change-Id: Iad7c0c183b86b5b1a9d5f6d02be2527947df6732
2016-09-13 22:51:51 +00:00
Colin Cross
628a88c951
Fix windows builds
...
Windows builds have the first arch set to x86 and the second set to
x86_64, and always prefers 32-bit. Specify the 32-bit preference
manually, instead of relying on the architecture order for now.
Change-Id: I1900ec095e7773f68c0db293bfc48bd0815661b2
2016-09-13 15:15:51 -07:00
Colin Cross
b4ce0ecad6
Remove cc.Customizer
...
Remove cc.Customizer, its functionality has been replaced by
android.PropertyCustomizer, and it is not used.
Change-Id: Ice32d554015b0800707bc042b187984f73df7979
2016-09-13 13:44:56 -07:00
Colin Cross
a7327c8325
Merge "Fix binaries and symlinks for prefer32" am: 9fdbbb3c54
am: d9005822c7
...
am: 3c0809424b
Change-Id: I9ab21cf3beb1acfe05da680e89b85cb75c79263c
2016-09-13 20:01:38 +00:00
Colin Cross
3c0809424b
Merge "Fix binaries and symlinks for prefer32" am: 9fdbbb3c54
...
am: d9005822c7
Change-Id: I3b5da4409d6504a5f4d90ae76abceb04b6d28fd1
2016-09-13 19:59:06 +00:00
Colin Cross
d9005822c7
Merge "Fix binaries and symlinks for prefer32"
...
am: 9fdbbb3c54
Change-Id: Id8ae0404be8a3ce3dfde2f20ecd0404de16146e7
2016-09-13 19:56:07 +00:00
Colin Cross
9fdbbb3c54
Merge "Fix binaries and symlinks for prefer32"
2016-09-13 19:43:00 +00:00
Colin Cross
8b74d17220
Fix binaries and symlinks for prefer32
...
Track the primary architecture selected for each class based on the
module's multilib setting and the global config. Fixes building
binaries with multlib set to first and DevicePrefer32BitExecutables set,
and fixes symlinks to binaries with multilib set to prefer32.
Bug: 31452121
Test: mmma -j art HOST_PREFER_32_BIT=true
Change-Id: I75094df42f3273f6d613e4058eaa565957174c28
2016-09-13 10:01:45 -07:00
Dan Willemsen
a0fb8d7ade
Merge 440415a704
into nyc-mr1-dev-plus-aosp
2016-09-12 18:47:34 -07:00
Dan Willemsen
440415a704
Add system/media/* to root.bp am: d2e4b1a7cd
...
am: 11eb47cc10
Change-Id: I8e186018e2a2f289b64a44cedfbdff0fc2050070
2016-09-13 01:01:07 +00:00
Dan Willemsen
11eb47cc10
Add system/media/* to root.bp
...
am: d2e4b1a7cd
Change-Id: If0ae8e95b20bfb80c517d6db118063bc3210d9ac
2016-09-13 00:58:07 +00:00
Dan Willemsen
d2e4b1a7cd
Add system/media/* to root.bp
...
Change-Id: I100612403e26c4373f0b047c622f6ffddc67be55
2016-09-12 16:23:19 -07:00
Dan Willemsen
efb5a702fe
Dynamically generate arch struct am: b1957a5021
am: cb55b8d2ef
...
am: 099b1c4a4b
Change-Id: Idd649f2324b718f9f783a2b1c6d6d86928257b93
2016-09-09 21:56:35 +00:00
Dan Willemsen
099b1c4a4b
Dynamically generate arch struct am: b1957a5021
...
am: cb55b8d2ef
Change-Id: I8982a53b03d7414c88ead966722b8a765720289b
2016-09-09 21:54:04 +00:00
Dan Willemsen
cb55b8d2ef
Dynamically generate arch struct
...
am: b1957a5021
Change-Id: Ife8a40f0667c9a4db8350e6cbe883575dd8407d1
2016-09-09 21:51:04 +00:00
Dan Willemsen
b1957a5021
Dynamically generate arch struct
...
Now we don't need to hardcode the list of OS/Arch/Variant/Features in
android/arch.go.
Change-Id: I0f9cc35d55baa31f036825fdf5b9dd30d076e56e
2016-09-08 13:50:36 -07:00
Colin Cross
c450e80112
Add -z to valid multi-word linker flags am: 42d1ba2d92
am: 813c97d8d9
...
am: 477dfbd142
Change-Id: I769867fe9cd66c11dc7aa1f7a2af3a6ec5c0ab6e
2016-09-07 21:20:44 +00:00
Colin Cross
dd2b874dfd
Allow CustomizeProperties to override linker am: 522e373a22
am: dca1ac1325
...
am: 471d8fed46
Change-Id: Id5ee577a4b42c9e3fb2ee09b406618345521fa90
2016-09-07 21:20:43 +00:00
Colin Cross
477dfbd142
Add -z to valid multi-word linker flags am: 42d1ba2d92
...
am: 813c97d8d9
Change-Id: Id9ec4ffec4a546884fa083dcb1eebfc279578ea4
2016-09-07 21:18:14 +00:00
Colin Cross
471d8fed46
Allow CustomizeProperties to override linker am: 522e373a22
...
am: dca1ac1325
Change-Id: I68390fd7b226146f3484301e6084e9b046b99c1b
2016-09-07 21:18:13 +00:00
Colin Cross
813c97d8d9
Add -z to valid multi-word linker flags
...
am: 42d1ba2d92
Change-Id: If845faa6a3224a0a48f436295b4753ec4e134e08
2016-09-07 21:15:43 +00:00
Colin Cross
dca1ac1325
Allow CustomizeProperties to override linker
...
am: 522e373a22
Change-Id: I4f95107fd19963712302fbf753a7c093c89df547
2016-09-07 21:15:43 +00:00
Colin Cross
42d1ba2d92
Add -z to valid multi-word linker flags
...
Art uses -z muldefs, allow it to be passed as a property.
Change-Id: Ief3b252d4b84762dbd49766ecdbebe00b333f523
2016-09-07 13:15:25 -07: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
444a3f4a3c
Merge "Extend multilib" am: 1e8ed27de3
am: 5b25ba18ec
...
am: 7c6334e1de
Change-Id: I14dc08c7c78924ce5d3f56dea4dc13a9b78dd9d7
2016-09-07 00:39:16 +00:00
Colin Cross
7c6334e1de
Merge "Extend multilib" am: 1e8ed27de3
...
am: 5b25ba18ec
Change-Id: Id962c422b58605ff885c0cf41185a6206d746cd3
2016-09-07 00:36:45 +00: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
aa837e13d2
Merge "[mips] Disable compact branch generation" am: ca06cc331d
am: 3daec3e3e4
...
am: 4bbc689ff4
Change-Id: I2d183ff81dc7ff8c7fdcd0431b10235bddd60e94
2016-09-06 23:01:31 +00:00
Nikola Veljkovic
4bbc689ff4
Merge "[mips] Disable compact branch generation" am: ca06cc331d
...
am: 3daec3e3e4
Change-Id: I4c6b68679fc297e94fff0f5e5222319dce8a9b60
2016-09-06 22:43:46 +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