Commit Graph

41687 Commits

Author SHA1 Message Date
Jingwen Chen e32e9e07d7 bp2build: arch-specific exclude_srcs and srcs.
OS-specific exclude_srcs and srcs will be done in a follow-up, due to
complexities from merging multiple select statements together.

Test: TH
Bug: 186153868
Change-Id: I01b881e9a5a7cd41b4a507f8be7e9e65eab37bdc
2021-04-27 11:02:07 +00:00
Jingwen Chen 17e6aaa1dd bp2build: remove header globs in generated srcs. am: 882bcc1c1c am: 40079e7151 am: f097636e9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687508

Change-Id: I5c60454f96cfb11d00afe0c6b89b3c44b13c5e2b
2021-04-27 10:37:44 +00:00
Jingwen Chen f097636e9d bp2build: remove header globs in generated srcs. am: 882bcc1c1c am: 40079e7151
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687508

Change-Id: I949da244662e21001988375dad88c2c49f967ddf
2021-04-27 10:11:51 +00:00
Jingwen Chen 4ecc67d3c5 bp2build: fix exclude_srcs in subpackages.
In a non-top level Android.bp file, exclude_srcs was not working at all
due to a bug in expandSrcsForBazel. GlobFiles was expanding a glob
relative to root, but the expandedExcludes list was relative to the
module dir, causing the glob function to not consider the
expandedExcludes list at all.

Add tests to demonstrate that this is working now.

Test: TH
Bug: 186388919
Change-Id: Ice8254231d085b39126e91b823a09ec328ee0ae0
2021-04-27 09:51:08 +00:00
Jingwen Chen 40079e7151 bp2build: remove header globs in generated srcs. am: 882bcc1c1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687508

Change-Id: I1eda934fe14d6c2be94dcac94efe7c2cbced7fa4
2021-04-27 08:27:10 +00:00
Jingwen Chen 882bcc1c1c bp2build: remove header globs in generated srcs.
Not needed anymore for bp2build-incremental since https://android-review.googlesource.com/q/topic:no-include-check.

Not needed for mixed builds either, since cc compile actions aren't sandboxed.

Fixes: 186488830
Test: treehugger and go tests

Change-Id: Ib5d4908dcce6bf910a653c457bb251d726e717d4
2021-04-27 06:26:40 +00:00
Colin Cross b861a9a53d Merge "Fix and test vendor public libraries for product modules" am: c30d7beb8f am: 7541409e7c am: 9667ee96d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687467

Change-Id: I60d18435ae4a0527342f8f968363a5e5d8c7568c
2021-04-27 04:45:29 +00:00
Colin Cross ce0d7bff69 Merge "Move TestVendorPublicLibraries into vendor_public_library_test.go" am: e3f2869573 am: 406b79a250 am: bd20e7e216
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687466

Change-Id: Ibe80935cd00a2852b1e3800c19863b49fedfb0aa
2021-04-27 04:45:22 +00:00
Colin Cross 9667ee96d5 Merge "Fix and test vendor public libraries for product modules" am: c30d7beb8f am: 7541409e7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687467

Change-Id: I5ff88d27f21f2ab3a4a571a9d26770fa4653df0e
2021-04-27 04:27:30 +00:00
Colin Cross bd20e7e216 Merge "Move TestVendorPublicLibraries into vendor_public_library_test.go" am: e3f2869573 am: 406b79a250
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687466

Change-Id: I9d313fe8a48b8649a46b3069ac19ef799c9fe86d
2021-04-27 04:27:23 +00:00
Colin Cross 7541409e7c Merge "Fix and test vendor public libraries for product modules" am: c30d7beb8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687467

Change-Id: If9aec5161f8ab54f497b74466473c552cdd84cf1
2021-04-27 04:12:44 +00:00
Colin Cross 406b79a250 Merge "Move TestVendorPublicLibraries into vendor_public_library_test.go" am: e3f2869573
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687466

Change-Id: I6b683635f02386ef4b437a324e31c20fb316dbf0
2021-04-27 04:12:08 +00:00
Colin Cross c30d7beb8f Merge "Fix and test vendor public libraries for product modules" 2021-04-27 03:40:27 +00:00
Colin Cross e3f2869573 Merge "Move TestVendorPublicLibraries into vendor_public_library_test.go" 2021-04-27 03:39:21 +00:00
Treehugger Robot f7e6ab6eab Merge "Drop DexPreoptImages field in dexpreopt config" am: bdae1e5765 am: 73ec83be2c am: 51801ac108
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686011

Change-Id: I36a7c371baadf9c19bb7c03efcaebefee6b4b336
2021-04-27 03:23:10 +00:00
Treehugger Robot 51801ac108 Merge "Drop DexPreoptImages field in dexpreopt config" am: bdae1e5765 am: 73ec83be2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686011

Change-Id: I32468596016b597a7717eaf1e6a618b12f1a5a97
2021-04-27 02:57:14 +00:00
Steven Moreland 8fc8dbf70c start eating include_dirs from both ends
Further restrictions on a restricting build configuration. Before, we
restricted certain paths from being included. Now, we restrict certain
paths from including.

This adds system/libfmq for now, but I'm planning to add more in the
future, as they are cleaned up.

Bug: 35624006
Test: m nothing
Change-Id: I913f190f93ab63059ee0372d342daa8f5584806b
2021-04-27 02:56:03 +00:00
Treehugger Robot 73ec83be2c Merge "Drop DexPreoptImages field in dexpreopt config" am: bdae1e5765
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686011

Change-Id: Id42910b1adfbe4601b5a7a9d7739feac921635a4
2021-04-27 02:38:31 +00:00
Steven Moreland 2c4000c7a6 apex: remove use_vendor
Should manually cut dependencies instead. Previously, this was used to
take advantage of the limited dependencies of variant libs in some APEXes.

Fixes: 175318864
Test: m nothing
Change-Id: Id559fd1bea5c8b8696cf7ab8acc711a7c3844d14
2021-04-27 02:08:49 +00:00
Treehugger Robot bdae1e5765 Merge "Drop DexPreoptImages field in dexpreopt config" 2021-04-27 01:53:45 +00:00
Colin Cross 1f3f130e29 Add support for cc_library_headers to replace llndk_headers
Set llndk.llndk_headers: true to allow a cc_library_headers
module to be used by a cc_library module with llndk.symbol_file set.

Bug: 170784825
Test: TestLlndkHeaders
Change-Id: Ib65a4b70717dc9a54ae30f2991485bb1bb9b8409
2021-04-26 18:37:44 -07:00
Colin Cross be763f7b16 Skip default dependencies for header libraries
Header libraries don't compile anything, so they don't need the
default stl and libclang_rt dependencies.  Trimming the dependencies
simplifies using header libraries for LLNDK libraries, which need
extra variants that don't exist for the default dependencies.

Test: m checkbuild
Change-Id: Ib9864c3cc7048b2cc52acf304830777b65a51877
2021-04-26 18:23:45 -07:00
Colin Cross b719c0194e Fix and test vendor public libraries for product modules
Vendor public libraries are checked for product modules, but never
reached because the VNDK check occurs first, and wouldn't work anyways
because vendor_public_library did not have the product_available
property.  Reorder the rewrite checks and add VendorProperties, and
add a test.

Bug: 178231622
Test: vendor_public_library_test.go
Change-Id: Idbd2802fbd134d22c30600762cb0465633703506
2021-04-26 18:23:45 -07:00
Treehugger Robot 47b2cba405 Merge "Revert "Reorganize and cull cc_library_static denylist."" am: 1f8a7f06d9 am: 429d1d9d5b am: 93dc5cee68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687146

Change-Id: I191e8b8b38d20813b90b2d34ab13caa3133d34d9
2021-04-27 01:03:13 +00:00
Colin Cross f12db530d0 Move TestVendorPublicLibraries into vendor_public_library_test.go
Bug: 178231622
Test: TestVendorPublicLibraries
Change-Id: Ic57202a7e4e186483506ceca3125f3d6a855f3ff
2021-04-26 17:43:32 -07:00
Treehugger Robot 93dc5cee68 Merge "Revert "Reorganize and cull cc_library_static denylist."" am: 1f8a7f06d9 am: 429d1d9d5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687146

Change-Id: Ic80c9eb9f8c994be10ed183b6c92a3dcb33ad17d
2021-04-27 00:28:49 +00:00
Treehugger Robot 429d1d9d5b Merge "Revert "Reorganize and cull cc_library_static denylist."" am: 1f8a7f06d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687146

Change-Id: Ib7c69606da30a67da1e4476b1a6511b5b144d61e
2021-04-27 00:05:47 +00:00
Treehugger Robot 1f8a7f06d9 Merge "Revert "Reorganize and cull cc_library_static denylist."" 2021-04-26 23:46:42 +00:00
Paul Duffin 04c7a35a60 Merge "bootclasspath_fragment: Always output contents property in snapshot" am: aef7fcfa7e am: 817d462f97 am: b9e926f26a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686127

Change-Id: Ie02e884b4271c39c4a101e326c85eb2207434c76
2021-04-26 23:38:51 +00:00
Paul Duffin 940a777464 Merge "Automatically add bootclasspath_fragment contents to sdk" am: 56d3ea4998 am: 7d43ff1fd8 am: b157de0c84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686126

Change-Id: I809cb2e96f550dc718886e8a78e20e7795883bd2
2021-04-26 23:37:45 +00:00
Paul Duffin d9668be58b Merge "Allow contents and image_name to be specified together" am: 3d14889c5b am: 1081c7d85e am: 143eb249d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686066

Change-Id: I0a6cce08f1c1b48aa2e9a1832212bf7aa2d8fdec
2021-04-26 23:36:31 +00:00
Paul Duffin b9e926f26a Merge "bootclasspath_fragment: Always output contents property in snapshot" am: aef7fcfa7e am: 817d462f97
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686127

Change-Id: I1963c51ffd3b4370d7fdac41d90a13a059edab55
2021-04-26 23:12:39 +00:00
Paul Duffin b157de0c84 Merge "Automatically add bootclasspath_fragment contents to sdk" am: 56d3ea4998 am: 7d43ff1fd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686126

Change-Id: I2adc481b5f3716bba1410120643e77cd91ad5c9b
2021-04-26 23:12:05 +00:00
Paul Duffin 143eb249d6 Merge "Allow contents and image_name to be specified together" am: 3d14889c5b am: 1081c7d85e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686066

Change-Id: I783a73cca2c05596477f46c9b38bf9bc3ba4b68e
2021-04-26 23:10:58 +00:00
Paul Duffin 817d462f97 Merge "bootclasspath_fragment: Always output contents property in snapshot" am: aef7fcfa7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686127

Change-Id: Ia0074f40dc513aef2bb0079b6faf5eb476c663fc
2021-04-26 22:50:06 +00:00
Paul Duffin 7d43ff1fd8 Merge "Automatically add bootclasspath_fragment contents to sdk" am: 56d3ea4998
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686126

Change-Id: Iddcb0575e9de21689f0c7ccdcd6f51cbbdc3c2eb
2021-04-26 22:49:00 +00:00
Paul Duffin 1081c7d85e Merge "Allow contents and image_name to be specified together" am: 3d14889c5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686066

Change-Id: Icf6a58e6b53d42fc9b5ae6d2c16a22ab27ff5ed9
2021-04-26 22:47:26 +00:00
Matthew Maurer e8a0e6b5c8 Merge "Enable overflow checks in Rust" am: 5fa13b8457 am: 3b9f1171d1 am: 35840626d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659257

Change-Id: I3c31fa68afd33ab1256f3b0e36a2c085a9b4ec7d
2021-04-26 22:32:53 +00:00
Liz Kammer cc86ac88a8 Revert "Reorganize and cull cc_library_static denylist."
This reverts commit cba7b0c43c.

Reason for revert: mixed_droid failing: libbacktrace fails due to libasync_safe, linkerconfig (and others) due to duplicate symbols

Change-Id: Ib6dd6bbb6f76048a7abd0970d457cf75921beae6
2021-04-26 22:17:48 +00:00
Matthew Maurer 35840626d1 Merge "Enable overflow checks in Rust" am: 5fa13b8457 am: 3b9f1171d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659257

Change-Id: I74a89fed25afbc8d287cc7203a456322e95ae9d8
2021-04-26 22:07:18 +00:00
Paul Duffin aef7fcfa7e Merge "bootclasspath_fragment: Always output contents property in snapshot" 2021-04-26 22:05:59 +00:00
Paul Duffin 56d3ea4998 Merge "Automatically add bootclasspath_fragment contents to sdk" 2021-04-26 22:04:14 +00:00
Paul Duffin 3d14889c5b Merge "Allow contents and image_name to be specified together" 2021-04-26 22:03:51 +00:00
Matthew Maurer 3b9f1171d1 Merge "Enable overflow checks in Rust" am: 5fa13b8457
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659257

Change-Id: If72f157302183cfd933642ac1b995c81cd84fbfd
2021-04-26 21:15:22 +00:00
Paul Duffin 94cc88a03c Extract java SdkMemberType instances as vars am: 2da0424b19 am: 233f0ac8eb am: 25c77484ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686125

Change-Id: Id7829a5d0f4e45085b597453d42d0d69ebfdfd1b
2021-04-26 21:00:49 +00:00
Paul Duffin 702254af25 Merge "Add coverage specific properties to bootclasspath_fragment" am: ef289f8853 am: ceeb8949f9 am: 5c11c01785
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686065

Change-Id: I342e755de9614c20eaf09f33488d58f1242db312
2021-04-26 21:00:44 +00:00
Peter Collingbourne 3086efcba1 Merge "Don't print RBE stats if ANDROID_QUIET_BUILD is set." am: 19947656df am: 18a53ad036 am: ccb5bcb902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682567

Change-Id: I174e9fb53987f6d70175c46852310512a5e051ab
2021-04-26 21:00:36 +00:00
Matthew Maurer 5fa13b8457 Merge "Enable overflow checks in Rust" 2021-04-26 20:46:21 +00:00
Paul Duffin 25c77484ae Extract java SdkMemberType instances as vars am: 2da0424b19 am: 233f0ac8eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686125

Change-Id: Ife206868863091d56765e9c8d85f3a6643633baf
2021-04-26 20:37:19 +00:00
Paul Duffin 5c11c01785 Merge "Add coverage specific properties to bootclasspath_fragment" am: ef289f8853 am: ceeb8949f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686065

Change-Id: Id1b8730e45818608e7727d04e01b29567cc13591
2021-04-26 20:37:13 +00:00