Commit Graph

1786 Commits

Author SHA1 Message Date
Colin Cross
802470f7c5 Support mixed ASAN and non-ASAN host builds am: b0f28957ae
am: 1bb040ff67

Change-Id: Iafbde074d53cd89e2caf017c4c1ae0de8fd1968e
2016-09-20 17:04:34 +00:00
Colin Cross
fed7b92b7e Fix checkbuild for modules with last variant disabled
am: 9b1d13db73

Change-Id: I19c368bdce8e7822c21a6a3ede4ee7f9891d7c9a
2016-09-20 16:57:14 +00:00
Colin Cross
1bb040ff67 Support mixed ASAN and non-ASAN host builds
am: b0f28957ae

Change-Id: I68e7600f0c7775550f17ac2e6131177afe0728f0
2016-09-20 16:57:13 +00:00
Colin Cross
9b1d13db73 Fix checkbuild for modules with last variant disabled
The soong checkbuild target is created by the last varaint of each
module.  Don't return early if the variant is disabled, which would
prevent creating the checkbuild target.

Test: m -j checkbuild
Change-Id: Ib260bae7fb4be7255f5c1b34dfbd50225f308005
2016-09-19 16:50:35 -07:00
Colin Cross
b0f28957ae Support mixed ASAN and non-ASAN host builds
Host builds may build binaries that must have ASAN disabled.  Convert
host ASAN to use variants.  Since there is only one install location for
shared libraries, don't install the non-ASAN variant at all for now.

Test: mmma -j art SANITIZE_HOST=address
Change-Id: Iacefecac93df44823316624b4c540c24f643fb80
2016-09-19 16:50:35 -07:00
Colin Cross
3ebdaf2984 Make ndk.timestamp optional am: f09c8437f9 am: b8332205f8
am: 7f73badbd6

Change-Id: Iabd0e4ad424520b8bfc1a86e163dcf72748c5ebe
2016-09-16 21:55:28 +00:00
Colin Cross
7f73badbd6 Make ndk.timestamp optional am: f09c8437f9
am: b8332205f8

Change-Id: Idac0cbaa28cfd9979d4f062f8b68c53d7ab97e7f
2016-09-16 21:52:53 +00:00
Colin Cross
b8332205f8 Make ndk.timestamp optional
am: f09c8437f9

Change-Id: I9c389c18ad585a043aa75d1e7ec58fb699bf03fe
2016-09-16 21:50:23 +00:00
Colin Cross
f09c8437f9 Make ndk.timestamp optional
Singleton rules need to manually specify Optional: true, or they will be
built for any ninja invocation that has no targets specified.

Test: m -j on tradefed build
Change-Id: Ifc060b25bc32e664c48731eb8a0d963b73574591
2016-09-16 12:53:59 -07:00
Dan Albert
2a7c0a5e0f Merge changes from topics 'ndk-libc++-libdl', 'ndk-compiler-rt_extras' am: 702b561ee5 am: 5965ec1ab0
am: 17b8ed4fb0

Change-Id: Idc78c0796b7e285d3e5b7f1aef70c91058535e02
2016-09-16 06:55:07 +00:00
Dan Albert
476d4e5131 Always link libdl with libc++ for the NDK. am: 3895d5b246 am: 302f23977f
am: dc6d753e2c

Change-Id: I03827a4229dcd3f9c0b27082bf4dcabb8fa748d6
2016-09-16 06:54:16 +00:00
Dan Albert
19aaec2451 Use libcompiler-rt_extras with NDK builds. am: 83705c88d7 am: 5e3f38db17
am: 8d7740b1f4

Change-Id: I3799ff78d637c51deae734195fc8fd04e10f7772
2016-09-16 06:54:15 +00:00
Dan Albert
17b8ed4fb0 Merge changes from topics 'ndk-libc++-libdl', 'ndk-compiler-rt_extras' am: 702b561ee5
am: 5965ec1ab0

Change-Id: I67810b788c93ba1c26102b7ce9a93d8957978b68
2016-09-16 06:52:01 +00:00
Dan Albert
dc6d753e2c Always link libdl with libc++ for the NDK. am: 3895d5b246
am: 302f23977f

Change-Id: I04c8504f54ac5d248e70475edc88cfe54babded4
2016-09-16 06:51:14 +00:00
Dan Albert
8d7740b1f4 Use libcompiler-rt_extras with NDK builds. am: 83705c88d7
am: 5e3f38db17

Change-Id: I5db2704e11ef8f30498a8698e6a3204d44fcc14d
2016-09-16 06:51:13 +00:00
Dan Albert
5965ec1ab0 Merge changes from topics 'ndk-libc++-libdl', 'ndk-compiler-rt_extras'
am: 702b561ee5

Change-Id: Ia53d479916ac5aea2a466eedd12661351ab7dfc9
2016-09-16 06:48:13 +00:00
Dan Albert
302f23977f Always link libdl with libc++ for the NDK.
am: 3895d5b246

Change-Id: Idd23c265a7a3c0f8efd48cf83d52870a5025aa6d
2016-09-16 06:45:34 +00:00
Dan Albert
5e3f38db17 Use libcompiler-rt_extras with NDK builds.
am: 83705c88d7

Change-Id: I65627012c592dc2c424d10a87450f232b8e6f339
2016-09-16 06:45:33 +00:00
Treehugger Robot
702b561ee5 Merge changes from topics 'ndk-libc++-libdl', 'ndk-compiler-rt_extras'
* changes:
  Always link libdl with libc++ for the NDK.
  Use libcompiler-rt_extras with NDK builds.
2016-09-16 06:40:32 +00:00
Colin Cross
cf4fc79836 Merge "Improve test support for art tests" am: 0e19618906 am: 79cb52c7ec
am: 06ba5856e9

Change-Id: I6cd395021f8045597d4059a8d0b403266d869309
2016-09-15 21:58:08 +00:00
Colin Cross
06ba5856e9 Merge "Improve test support for art tests" am: 0e19618906
am: 79cb52c7ec

Change-Id: Ic7f4fb57f7359638b78fe271a7dc5c93a8c9ffa4
2016-09-15 21:55:10 +00:00
Colin Cross
79cb52c7ec Merge "Improve test support for art tests"
am: 0e19618906

Change-Id: I010c4f1f9cd61ed1957640ecdd8ea07e6959bf49
2016-09-15 21:52:26 +00:00
Colin Cross
0e19618906 Merge "Improve test support for art tests" 2016-09-15 21:47:07 +00:00
Colin Cross
426730add5 Split CommonGlobalIncludes for system includes am: 1cfd89aca3 am: 74a8c40cca
am: 2cc34cf368

Change-Id: Ib04b25e85fd7b4f0412d428ae41465e03c773cdd
2016-09-15 18:23:21 +00:00
Colin Cross
2cc34cf368 Split CommonGlobalIncludes for system includes am: 1cfd89aca3
am: 74a8c40cca

Change-Id: Ia3979beff5bf4557404e0a43d02a74116746a093
2016-09-15 18:20:20 +00:00
Colin Cross
74a8c40cca Split CommonGlobalIncludes for system includes
am: 1cfd89aca3

Change-Id: If983beb6b00b0e6348f838ad2a44616a4711cd63
2016-09-15 18:17:50 +00:00
Colin Cross
1cfd89aca3 Split CommonGlobalIncludes for system includes
Split CommonGlobalSystemIncludes out of CommonGlobalIncludes in
preparation for moving global includes from -isystem to -I.

Bug: 31492149
Change-Id: Ib935ea038cdbf9515dc2ab68d7fff924c370906a
2016-09-15 09:33:57 -07:00
Dan Willemsen
f2bb2704cd Merge "Sort NDK_MIGRATED_LIBS in make_vars" am: 98e7e66cb6 am: 565fc67ac9
am: 6bfb956885

Change-Id: Icb03c8a402de633e479ac2ce426222cea11d838c
2016-09-15 05:28:29 +00:00
Dan Willemsen
6bfb956885 Merge "Sort NDK_MIGRATED_LIBS in make_vars" am: 98e7e66cb6
am: 565fc67ac9

Change-Id: Iccbc5465eadc12ed938b5cdade164aa769dbc7b8
2016-09-15 05:25:58 +00:00
Dan Willemsen
565fc67ac9 Merge "Sort NDK_MIGRATED_LIBS in make_vars"
am: 98e7e66cb6

Change-Id: I2f144cca0b625fddb6cc59b513326a33ea9fadce
2016-09-15 05:23:28 +00:00
Treehugger Robot
98e7e66cb6 Merge "Sort NDK_MIGRATED_LIBS in make_vars" 2016-09-15 05:18:04 +00:00
Dan Willemsen
8a11306647 Add Relocation Packer support am: 394e9dc876 am: 197497396a
am: 356bf7eb6d

Change-Id: I8754643318a5e64005fa168426669121ea0d9c48
2016-09-15 03:55:59 +00:00
Dan Willemsen
356bf7eb6d Add Relocation Packer support am: 394e9dc876
am: 197497396a

Change-Id: I724331e370f1f2972e8209826f0d1234c0142d45
2016-09-15 03:54:00 +00:00
Dan Willemsen
197497396a Add Relocation Packer support
am: 394e9dc876

Change-Id: Ib07800a5773223de38bcd8fbac88bc0bf3bbe9f2
2016-09-15 03:51:00 +00:00
Dan Willemsen
394e9dc876 Add Relocation Packer support
This only applies to shared libraries on the device, and like stripping,
we'll let make do the actual packing if we're embedded in Make.

Change-Id: I1585d74ecfc41e18dcbb5ffb70005adf007cc941
2016-09-15 03:39:05 +00:00
Dan Willemsen
65905f8f62 Sort NDK_MIGRATED_LIBS in make_vars
Otherwise this was changing every time, and causing Kati to find
make_vars-*.mk different every time.

Test: with https://android-review.googlesource.com/274439
Change-Id: I731b3b2fd434314bf6e8b7c2ec5310b9623512a5
2016-09-14 20:29:05 -07:00
Dan Willemsen
7f4d70cbcf Remove extra LOCAL_CXX_STL := none am: 391cdde1da am: 72b2567843
am: 650d6f73dc

Change-Id: I5325d829acb5b3afa74c67ff051deaef3ef08794
2016-09-15 01:16:13 +00:00
Dan Willemsen
650d6f73dc Remove extra LOCAL_CXX_STL := none am: 391cdde1da
am: 72b2567843

Change-Id: I995b7fe6d749e1d1037118dadab7aa37c746d926
2016-09-15 01:13:42 +00:00
Dan Willemsen
72b2567843 Remove extra LOCAL_CXX_STL := none
am: 391cdde1da

Change-Id: Icfc0834b4f26254fe2229270e4797246c4270535
2016-09-15 01:10:41 +00:00
Dan Albert
3895d5b246 Always link libdl with libc++ for the NDK.
Soong change to match
https://android-review.googlesource.com/#/c/274447/.

Test: make checkbuild tests
Bug: None
Change-Id: I25bfed6d99b97c406f40892ae4abc38f4e656e81
2016-09-14 16:50:48 -07:00
Dan Albert
83705c88d7 Use libcompiler-rt_extras with NDK builds.
Soong change to match
https://android-review.googlesource.com/#/c/274448/.

Test: make checkbuild tests
Bug: None
Change-Id: Ibc3732ce5b4a43a9151dca39a53572d248f86c45
2016-09-14 16:47:18 -07:00
Dan Willemsen
391cdde1da Remove extra LOCAL_CXX_STL := none
This was always being set in cc.Module.AndroidMk(), so we don't need to
declare it again. This was causing problems for cc_binary modules that
were using the NDK, since LOCAL_NDK_STL_VARIANT must be used instead.

Test: Manually put ifneq ($(LOCAL_CXX_STL),none); $(error) checks
Change-Id: If937b7b5ad30936e08c99f62ccf83b78d196dbfe
2016-09-14 16:12:29 -07:00
Colin Cross
600c9dfe7b Improve test support for art tests
Make gtest property a *bool so it can be overriden by defaults.
Make per-test install directory come after relative_install_path
property.

Change-Id: I2da38965c99c40415a39bf97b706b2d40bb082d6
2016-09-14 13:24:19 -07:00
Colin Cross
5f7aea5c01 Merge "Replace PropertyCustomizer with hooks" am: d784cff36a am: 0199fedf3b
am: 2834a7106c

Change-Id: I13a482e1ddedf8c69e314561cea1c2e95298e6a7
2016-09-14 17:03:19 +00:00
Colin Cross
2834a7106c Merge "Replace PropertyCustomizer with hooks" am: d784cff36a
am: 0199fedf3b

Change-Id: I20ddcaf1a63d0b2d1b2a7c28b559ce38bd5882f1
2016-09-14 16:57:20 +00:00
Colin Cross
0199fedf3b Merge "Replace PropertyCustomizer with hooks"
am: d784cff36a

Change-Id: I9899b5fb4d86765fc185306e2d8cbd9a4069ae7d
2016-09-14 16:54:48 +00:00
Colin Cross
d784cff36a Merge "Replace PropertyCustomizer with hooks" 2016-09-14 16:50:18 +00:00
Dan Willemsen
aa1c4bc51c Merge changes I8dd0f858,I15c17d0d am: dded092368 am: 6eb594b1a8
am: 9cf8de2b89

Change-Id: Id2255006bc61caa1b8cc6d7c8bda985619c93ed0
2016-09-14 02:14:21 +00:00
Dan Willemsen
6856a8b503 Add entries in root.bp for hidl/hwbinder am: 2c173ee03a am: 8e14ae827b
am: e7aa1ce099

Change-Id: I816ab1cc7dffd6502c07adf50e9b1893cf726e5a
2016-09-14 02:14:19 +00:00
Dan Willemsen
bba27bd529 Fix lex/yacc path am: 76ef5abd9a am: def921651a
am: b837f77565

Change-Id: I5d8084ffdda09525a2ff66b198fc0fcb649857e4
2016-09-14 02:14:18 +00:00