Commit Graph

1071 Commits

Author SHA1 Message Date
Dan Willemsen
a2b55d45d6 Merge "Simplify bootstrapping" am: 3cfaba1654
am: dc40771dbb

Change-Id: I229354da4a5d536d093dec6dfb451162a71f06dc
2016-08-31 16:14:29 +00: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
498ec1f4cf Merge "Add CC_WRAPPER support" am: ecc53306b8
am: 24c6e7d13a

Change-Id: I64c90890120d74702165e80a96aac73c68fdebe9
2016-08-30 19:44:55 +00: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
c2bc71978b Merge "Expose module suffixes to Make" am: 8be0e0ffde
am: 909ff131ae

Change-Id: Ifda211c1cf868776022a1bc099e873def1516ded
2016-08-30 02:26:26 +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
71dba12173 Merge "Add frameworks/av to root.bp" am: 5710e770ea
am: c3a6082769

Change-Id: I15d00dfd2173366f849c5cfb1515db418cdf39c5
2016-08-30 01:19:45 +00:00
Colin Cross
56cf6f16db Merge "Fix installation path for asan libraries" am: 27807b5415
am: d9b22d2173

Change-Id: Ibf5f16f8d0b93e32a0fc20c10309ef3ae9d505e7
2016-08-30 01:19:41 +00:00
Dan Willemsen
08ffe8a32d Merge "Move Android.bp definitions into subdirs" am: 70595d1e95
am: f1f62a544a

Change-Id: Ic40334222b13db1f4082a856488cb06d08226eab
2016-08-30 01:19:40 +00:00
Dan Willemsen
9e11cd27f8 Move Android.bp definitions into subdirs am: 377737a01c
am: ddc0180380

Change-Id: Ib359b55bbd980bc32d1bc4654ac6939a588d744d
2016-08-30 01:19:39 +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
f2f2980045 Switch to prebuilt clang-3217047 am: 15690c02d6
am: 1e61d9d964

Change-Id: I1f39eed52858393dc47946f2cbee7af8ae909ef9
2016-08-29 19:58:42 +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
85afe75b6a Merge "Fix mac art build" am: f5a50a8b17
am: 290975ca78

Change-Id: Id1c4cb86e9093c55b731fa46ef1eed5b33a64f83
2016-08-26 01:31:07 +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
7f0ac9d1e5 Add support for preferred arch symlinks am: 1e7d3706d6
am: c2c3500578

Change-Id: I15919e018d1c8a74914c446d40680d12de59d2f5
2016-08-26 00:09:05 +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
4866e726ba Add art am: 0f4e0d6c5d
am: 669ef7c13b

Change-Id: I9d608b4d6e756e80a5f34d22427d117af72eed75
2016-08-25 22:39:31 +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
c19665070f Merge "Revert "Add art"" am: d46b39d356
am: 2095599791

Change-Id: I83e5515dc510c0e8d2786928f6802191c9615a09
2016-08-25 01:15:24 +00: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
Colin Cross
857a527f67 Revert "Add art"
This reverts commit f7288f3906.

Change-Id: Ibb63fe2a95d1517fea63a65a7dbe5cac84902107
2016-08-25 01:03:59 +00:00
Colin Cross
8e4da2f532 Merge "Add art" am: 9bbec069a2
am: aa73de27cc

Change-Id: Ifd14f5206c372306ab5e23a85440224612ec988d
2016-08-25 00:41:52 +00:00
Colin Cross
aa73de27cc Merge "Add art"
am: 9bbec069a2

Change-Id: Ic9e6a4ea35d1337537fbeb98ba068c11b26deb12
2016-08-25 00:38:57 +00:00
Treehugger Robot
9bbec069a2 Merge "Add art" 2016-08-25 00:31:21 +00:00
Colin Cross
3b0a4b9a78 Add PropertyCustomizer am: a120ec1c5e
am: 7d93303540

Change-Id: I765e5b1cc7503aca3b7378e04a5c7b5680eaac8b
2016-08-23 20:18:30 +00:00
Colin Cross
75014582f3 Export DefaultsFactory am: e1d764e369
am: 83964d6f92

Change-Id: I93e4db5ec6e9b1c1e0a2f5eebcf51eabd6c37c83
2016-08-23 20:18:29 +00:00
Colin Cross
f7288f3906 Add art
Change-Id: I557c86d2282178d215ea17abb71e556bdc4ba722
2016-08-23 13:14:40 -07:00
Colin Cross
7d93303540 Add PropertyCustomizer
am: a120ec1c5e

Change-Id: Ia6241e8063bf07a0b63aa9a9ca6718e9db36c26b
2016-08-23 20:10:58 +00:00