StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,083 Commits 1 Branch 0 Tags
131f70c34b85e0dd56711bcbf522e97b4c7adc99
Commit Graph

52083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keun-young Park
131f70c34b Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" 2021-10-19 13:52:19 +00:00
Anton Hansson
52c3b6dbd4 [automerger skipped] Add annotations.zip support to java_sdk_library am: 3adf3c52eb -s ours 
am skip reason: Merged-In I955cae720e6f1382936836ee1d8fb11003f51b7d with SHA-1 d78eb76f64 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16062842

Change-Id: Ia925263e213d093891defc8304eaba3f470a54ba
 2021-10-19 11:41:01 +00:00
Dan Willemsen
8a4a4d1c7c Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db10b am: 1b58b45545 am: 3b309cd515 am: 55d6377cd7 am: 11d429ef89 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

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

Change-Id: If6d25efca764b6230fafdc8dbed90b5033204a81
 2021-10-19 01:42:26 +00:00
Dan Willemsen
11d429ef89 Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db10b am: 1b58b45545 am: 3b309cd515 am: 55d6377cd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

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

Change-Id: I63b2e529bc6d95ae855468f2ae4dd9efc4029a1b
 2021-10-19 01:28:20 +00:00
Dan Willemsen
55d6377cd7 Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db10b am: 1b58b45545 am: 3b309cd515 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

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

Change-Id: Ic0f8d6f0d3a75ab42d4007aa019578abbf1db3ef
 2021-10-19 01:05:25 +00:00
Keun young Park
6e3ba9ac3b Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS 
- car-frameworks-service-module is added from com.android.car.framework
  apex which only exisits in car products.

Bug: 203233647
Bug: 203201931
Test: build, bootup
Change-Id: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
 2021-10-19 00:47:47 +00: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
45c494ce73 Merge changes Ifa4594ea,Ia756f309 am: d26943459d am: 9fe62908b3 am: 710f9ae1b6 am: 232c3fdbc9 am: 0af4f628f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861274

Change-Id: I6180d5c3477c2d209c6f3816e6a0f9662b4a5f6e
 2021-10-18 23:27:10 +00:00
Liz Kammer
4e70bed816 Merge "Add tests for defaults used in conditions_default" am: 503f65da36 am: c2d63f1fbe am: eb0718277b am: bab00c698f am: c7f394afd9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859653

Change-Id: I6b5a70f14995c0c572d740c81cfdf3a56063ce52
 2021-10-18 23:26:54 +00:00
Colin Cross
0af4f628f5 Merge changes Ifa4594ea,Ia756f309 am: d26943459d am: 9fe62908b3 am: 710f9ae1b6 am: 232c3fdbc9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861274

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

Change-Id: Iae9f1f07ea6d0bcb31491029eebce3998bf0247f
 2021-10-18 23:09:51 +00:00
Colin Cross
232c3fdbc9 Merge changes Ifa4594ea,Ia756f309 am: d26943459d am: 9fe62908b3 am: 710f9ae1b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861274

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

Change-Id: I37eb8d00a59b74277cda2d5febd05259fe3dcfcf
 2021-10-18 22:58: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
Christopher Parsons
6e0292a05f Merge "Use hardlinks for Bazel's symlink actions" am: 9579f08f22 am: 321f3b0bf8 am: ed105d22d4 am: 2e4502157a am: b83d2d41f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858158

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

Change-Id: If3bbeed281170c0239eda2e4acecda5f0442f600
 2021-10-18 19:57:13 +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
2e4502157a Merge "Use hardlinks for Bazel's symlink actions" am: 9579f08f22 am: 321f3b0bf8 am: ed105d22d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858158

Change-Id: I20177057b9eb3428b21ddfa5745af839b2991d4d
 2021-10-18 19:37:52 +00: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
35ad032e7f Denylist genrules that create the same file in the same package. am: df27b7a1e0 am: d8d15b8fcd am: 242046f5c2 am: 5d45d92e3f am: 982f1144fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859776

Change-Id: If2e52db956f2e504718be59ebfd8ebc5d9984816
 2021-10-18 08:59:36 +00:00
Jingwen Chen
982f1144fa Denylist genrules that create the same file in the same package. am: df27b7a1e0 am: d8d15b8fcd am: 242046f5c2 am: 5d45d92e3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1859776

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

Change-Id: Id2032d625f7b164d2a1105a79c202ef56bc1f8df
 2021-10-18 08:24:06 +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
142126e68f Fix mac/allowmissingdeps builds am: 47e1a75851 am: a24a2c7d6e am: 933fb2296e am: f6b3379ee4 am: 316f60c2c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: Ib163545c88297b48c13a3d75a2521f2558166055
 2021-10-18 01:03:33 +00:00
Dan Willemsen
316f60c2c1 Fix mac/allowmissingdeps builds am: 47e1a75851 am: a24a2c7d6e am: 933fb2296e am: f6b3379ee4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: I84f47646ae8b7529b503c4dc746906326ce34b45
 2021-10-18 00:46:21 +00:00
Dan Willemsen
f6b3379ee4 Fix mac/allowmissingdeps builds am: 47e1a75851 am: a24a2c7d6e am: 933fb2296e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: If6257e44811696c93f244f90e9d625d1f552bb74
 2021-10-18 00:36:12 +00:00
Jiyong Park
1eea641e3e Merge "Add the device config GenerateAidlNdkPlatformBackend" 2021-10-18 00:25:07 +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