Commit Graph

46175 Commits

Author SHA1 Message Date
Treehugger Robot
e2446ba346 Merge "Include compos-module-sdk in the SDK build." am: b3486b23fe am: be3fc8b289
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859855

Change-Id: I5e5a6b7e397fbadbe27a38ce90e4fb4428660c30
2021-10-19 21:13:03 +00:00
Christopher Parsons
bdf745fa16 Merge "Add OS to configuration key in mixed builds" am: c0ed1f653f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858160

Change-Id: Ia85ffb68e9236a7a07ae7776b498a8485d1e9acf
2021-10-19 21:02:28 +00:00
Liz Kammer
bc57abcb55 Merge "bp2build include generated hdrs in all src splits" am: 2ec92fc0a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1862913

Change-Id: I7045465b3ea5831ba422c2a97b8fc594f07671fc
2021-10-19 21:02:23 +00:00
Christopher Parsons
5d065e7627 Merge "Add x86_host vars to config.bzl" am: a8b37dd7f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858395

Change-Id: I0773c8031b4a8e018cdd5f9db380c74ffee85aae
2021-10-19 21:02:17 +00:00
Treehugger Robot
be3fc8b289 Merge "Include compos-module-sdk in the SDK build." am: b3486b23fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859855

Change-Id: I7d0fc3b7851435bccd0f50267c89f20375cd2e9c
2021-10-19 21:02:09 +00:00
Christopher Parsons
c0ed1f653f Merge "Add OS to configuration key in mixed builds" 2021-10-19 20:57:47 +00:00
Chris Parsons
787fb36189 Add OS to configuration key in mixed builds
This also removes the special-case filegroup from mixed builds
buildroot; no special handling is required. Since we're currently
hardcoding linux_x86_64 as our host platform, it should be fine
to continue assumping that hardcoded host for now.

Test: USE_BAZEL_ANALYSIS=1 m adbd
Change-Id: I35509f4eb33ba7a243fab4c34b35958f6f2fceab
2021-10-19 16:55:52 -04:00
Liz Kammer
2ec92fc0a0 Merge "bp2build include generated hdrs in all src splits" 2021-10-19 20:51:00 +00:00
Trevor Radcliffe
44159cfb22 Allow for the installation of binaries in xbin am: 0dbe615ff4 am: 7e476bc55c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861933

Change-Id: Iae555ad5c085d9c9b1a6c92a64e5ad278a3c2f3b
2021-10-19 20:49:05 +00:00
Christopher Parsons
a8b37dd7f1 Merge "Add x86_host vars to config.bzl" 2021-10-19 20:48:54 +00:00
Treehugger Robot
b3486b23fe Merge "Include compos-module-sdk in the SDK build." 2021-10-19 20:46:30 +00:00
Trevor Radcliffe
7e476bc55c Allow for the installation of binaries in xbin am: 0dbe615ff4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861933

Change-Id: I9638084215749cac8a551c34ae4e963c0b39530d
2021-10-19 20:34:08 +00:00
Trevor Radcliffe
0dbe615ff4 Allow for the installation of binaries in xbin
su needs to be installed in xbin, and these changes modify
Soong to allow for this.

Fixes: 202405540
Test: Confirmed that binary was dropped into xbin
Change-Id: Ib664dc1255cd4d9049ac212f79cc53d5038cfcc7
2021-10-19 19:44:13 +00:00
Liz Kammer
2b8004b1ef bp2build: Add support for cc_binary.
Bug: 197920036
Test: build/bazel/ci/bp2build.sh
Change-Id: I2c4200967653af15a330ab8cbaf796b70d43f32d
2021-10-19 14:12:39 -04:00
Liz Kammer
ae3994ed4c bp2build include generated hdrs in all src splits
Currently generated headers are only included in the srcs split;
however, if c or assembly sources depend on the headers, the
dependendency is lacking and can cause non-deterministic failures.

Test: build/bazel/ci/bp2build.sh
Change-Id: Ic354c88300a5fb1b85241f68889e904c33a81488
2021-10-19 14:09:49 -04:00
Chris Parsons
3b1f83d076 Add x86_host vars to config.bzl
Test: USE_BAZEL_ANALYSIS=1 m adbd
Test: Manually verified config.bzl contains various x86_host flags after
bp2build.
Test: Unit tests

Change-Id: Ie9201ea2be4cd1c6659bea088a797cedbae37403
2021-10-19 12:18:13 -04:00
Dan Willemsen
3b309cd515 Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db10b am: 1b58b45545
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

Change-Id: Ib3972ab96988f638917cc2314652781661b60bdf
2021-10-19 00:47:10 +00:00
Alexander Smundak
3452ac8446 Merge "Fix wildcard ('%') handling in the filter pattern." am: 636a2132c3 am: 7040352e5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831853

Change-Id: I5d13fc90bc0c58515f0c1c836ccc8537d65400be
2021-10-19 00:46:59 +00:00
Dan Willemsen
1b58b45545 Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db10b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

Change-Id: Icf9381c2abf64c28c4dda77bccef8c8e26e4dbd0
2021-10-19 00:35:27 +00:00
Dan Willemsen
2a109db10b Merge "Reduce modules exposed to Make in Mac builds" 2021-10-19 00:32:54 +00:00
Alexander Smundak
7040352e5a Merge "Fix wildcard ('%') handling in the filter pattern." am: 636a2132c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831853

Change-Id: Ic7ed481cd3623a4631f47ea7865680fc42123d73
2021-10-19 00:29:27 +00:00
Alexander Smundak
636a2132c3 Merge "Fix wildcard ('%') handling in the filter pattern." 2021-10-19 00:11:56 +00:00
Colin Cross
710f9ae1b6 Merge changes Ifa4594ea,Ia756f309 am: d26943459d am: 9fe62908b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861274

Change-Id: Ic68646858f160c0b9c6e97b0549d43d149cf8868
2021-10-18 22:35:18 +00:00
Liz Kammer
eb0718277b Merge "Add tests for defaults used in conditions_default" am: 503f65da36 am: c2d63f1fbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859653

Change-Id: I6e2a1562ef6fff87607460c94ae695c29f689ec8
2021-10-18 22:35:14 +00:00
Colin Cross
9fe62908b3 Merge changes Ifa4594ea,Ia756f309 am: d26943459d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861274

Change-Id: I17119ed7a55b5491e159b47b390d87e9d606ce2e
2021-10-18 22:18:39 +00:00
Liz Kammer
c2d63f1fbe Merge "Add tests for defaults used in conditions_default" am: 503f65da36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859653

Change-Id: Id92d7587b5f6b05b906a48bdf9bd511c7dce8e5c
2021-10-18 22:18:26 +00:00
Colin Cross
d26943459d Merge changes Ifa4594ea,Ia756f309
* changes:
  Reduce commands per shard for java protos
  Up per-product memory usage to 30 GB
2021-10-18 22:03:43 +00:00
Liz Kammer
503f65da36 Merge "Add tests for defaults used in conditions_default" 2021-10-18 22:03:33 +00:00
Dan Willemsen
def7b5d198 Reduce modules exposed to Make in Mac builds
Device builds are no longer supported on Mac, but we do support building
various host tools, including the SDK build-tools and platform-tools
packages. These have dependencies on [java] device modules, so we don't
completely disable device modules, only hide them from Make (which makes
them more difficult to trigger from the command line).

Also fix the mac build of multiproduct_kati, so that `m blueprint_tools`
works on Mac.

Bug: 187222815
Test: `m`, `m dist`, etc on Mac
Change-Id: I92f16605d5cd173d431cbcb79081234d45cc6e2e
2021-10-18 12:44:45 -07:00
Christopher Parsons
ed105d22d4 Merge "Use hardlinks for Bazel's symlink actions" am: 9579f08f22 am: 321f3b0bf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858158

Change-Id: Id218374ba4c7bfd3015ad9e7c60994dd71cab8c5
2021-10-18 19:21:20 +00:00
Christopher Parsons
321f3b0bf8 Merge "Use hardlinks for Bazel's symlink actions" am: 9579f08f22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858158

Change-Id: I8cf598b1de51b3815313b6a5e5bb8c23d07aa873
2021-10-18 19:02:37 +00:00
Christopher Parsons
9579f08f22 Merge "Use hardlinks for Bazel's symlink actions" 2021-10-18 18:51:23 +00:00
Colin Cross
93fa5ef99d Reduce commands per shard for java protos
`m platformprotos` with a long OUT_DIR can trigger E2BIG errors in
posixspawn, reduce the commands per shard.

Test: OUT_DIR=$PWD/really-long-out-directory m platformprotos
Change-Id: Ifa4594eac7ba0e1091df0ef75e4dfc3ff366939b
2021-10-18 10:19:03 -07:00
Colin Cross
5cb7366c58 Up per-product memory usage to 30 GB
Reduce multiproduct_kati parallelism by upping required memory per product
to 30 GB.

Bug: 201671935
Test: builds
Change-Id: Ia756f309459d28e22a49f190a5227a139b356a1f
2021-10-18 10:18:51 -07:00
Liz Kammer
bdce0dfbdf Add tests for defaults used in conditions_default
Bug: 203123704
Test: go test soong tests
Change-Id: Ia12c51d01108ad1f311d738b182d4bb94c500810
2021-10-18 12:49:41 +00:00
Jingwen Chen
242046f5c2 Denylist genrules that create the same file in the same package. am: df27b7a1e0 am: d8d15b8fcd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859776

Change-Id: Ib1b79148f7d66e507c5e1ee6c33c64db524bf903
2021-10-18 08:08:52 +00:00
Jingwen Chen
d8d15b8fcd Denylist genrules that create the same file in the same package. am: df27b7a1e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859776

Change-Id: Ib98355dab3d99342385b253e8df13cebfe1bc9eb
2021-10-18 07:51:10 +00:00
Jingwen Chen
df27b7a1e0 Denylist genrules that create the same file in the same package.
Test: bp2build presubmits

Bug: 194642721
Bug: 203369847
Change-Id: Id0faff5fcf4136fac5236980dd60c5d8e54d9547
2021-10-18 06:33:16 +00:00
Dan Willemsen
933fb2296e Fix mac/allowmissingdeps builds am: 47e1a75851 am: a24a2c7d6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: I72e2a8826c71051f797e79ac2d2d1344a12b3246
2021-10-18 00:24:53 +00:00
Dan Willemsen
a24a2c7d6e Fix mac/allowmissingdeps builds am: 47e1a75851
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: I886407cff2d6f504b2625b02935376c9bdca4d87
2021-10-18 00:14:27 +00:00
Dan Willemsen
47e1a75851 Fix mac/allowmissingdeps builds
This WalkDeps loop was expecting the dependencies to be fully filled
out, which isn't necessarily true on AllowMissingDependencies builds,
especially on Mac when the modules may exist, but not be enabled.

This was triggered when make_erofs was added to an apex, but wasn't
enabled on Mac.

It shouldn't be a problem to skip the disabled dependencies, since we'll
have already marked the current module as missing dependencies, which
means it won't actually get built.

Test: `m nothing` on a mac
Change-Id: Icd6d597117be4cde5bff041be3fd47361c54cad9
2021-10-17 01:40:34 +00:00
Dan Willemsen
2b02c96bd0 Switch to the new build-tools/platform-tools implementation am: b07ae342e4 am: afeaa2ca7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859854

Change-Id: I34cfabdacbefeaab575f46996bcd1698cd6c288f
2021-10-16 20:40:45 +00:00
Dan Willemsen
afeaa2ca7b Switch to the new build-tools/platform-tools implementation am: b07ae342e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859854

Change-Id: I82e1aae5957f3c713c74711ecb18250a43963833
2021-10-16 20:30:30 +00:00
Dan Willemsen
b07ae342e4 Switch to the new build-tools/platform-tools implementation
Bug: 187222815
Change-Id: I8ccf92e3185ddb831e8b3f426d397164aef9b7fb
2021-10-15 13:39:47 -07:00
Victor Hsieh
5b817e642c Include compos-module-sdk in the SDK build.
Test: build/soong/scripts/build-mainline-modules.sh
Bug: 203231943
Change-Id: Icbd4b15b2434c8a0a7983d52732b5462f3a8b978
2021-10-15 13:38:59 -07:00
Ivan Lozano
d8f882b769 Merge "rust: Package shared libraries with fuzzer zips" am: e95b860598 am: 30da767581
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858393

Change-Id: Ie285fba3ef3e27342203d465c5bfdc6567fb08a7
2021-10-15 20:09:28 +00:00
Ivan Lozano
30da767581 Merge "rust: Package shared libraries with fuzzer zips" am: e95b860598
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858393

Change-Id: I9efdbd2f183d5087a1987bdaafc6093c7255125f
2021-10-15 19:51:04 +00:00
Ivan Lozano
e95b860598 Merge "rust: Package shared libraries with fuzzer zips" 2021-10-15 19:33:53 +00:00
Mohammad Islam
cfa380c303 Merge "Add EROFS support for APEX build system" am: 214a923f0d am: 7654b6b27c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784471

Change-Id: If97080b53710b82719b884abaa2349fa4d94b408
2021-10-15 16:09:26 +00:00
Mohammad Islam
7654b6b27c Merge "Add EROFS support for APEX build system" am: 214a923f0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784471

Change-Id: I4ff590972896bd0d06bd660e469afd0ef2bb8724
2021-10-15 15:57:50 +00:00