StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,597 Commits 1 Branch 0 Tags
d9668be58b54faa419365274d6ecdaa0d35bcd25
Commit Graph

41597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Peter Collingbourne
ccb5bcb902 Merge "Don't print RBE stats if ANDROID_QUIET_BUILD is set." am: 19947656df am: 18a53ad036 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682567

Change-Id: I227bb8f56d9f0226fd9916a6581d10848e4e98bc
 2021-04-26 20:37:05 +00:00
Lukács T. Berki
7e01a8376c Merge "Reorganize and cull cc_library_static denylist." am: 2567d80414 am: a373cd60e6 am: 6571ae1704 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683872

Change-Id: Id45e549f498bf87be9891969a89d3bcd44cc7916
 2021-04-26 20:28:29 +00:00
Paul Duffin
233f0ac8eb Extract java SdkMemberType instances as vars am: 2da0424b19 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686125

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

Change-Id: I1bdb4e817a133eafa639ba015d9967af2e0fb04d
 2021-04-26 20:26:31 +00:00
Paul Duffin
ba6afd0dba Allow contents and image_name to be specified together 
Previously, only one of the contents or image_name properties could be
specified at once which meant that there was no way to create a
prebuilt which lists its fixed contents while at the same time allowing
it to check that that the contents matched what the build configuration
required.

e.g. a prebuilt_bootclasspath_fragment that had image_name: "art",
could not list its contents and also check that those contents matched
the ART_APEX_JARS which the build configuration required.

This change allows contents and image_name to be specified together and
adds a check to make sure that the contents are consistent with the
configuration appropriate to the image_name. The check is only
performed for modules that are active so that a
prebuilt_bootclasspath_fragment which was created without coverage
enabled (the default) would not cause a build failure in a coverage
build unless it was preferred.

Bug: 177892522
Test: m nothing
Change-Id: Ie601f29f707b3f6030fa7d252afa2c4826cc9f8e
 2021-04-26 21:21:58 +01:00
Paul Duffin
2da0424b19 Extract java SdkMemberType instances as vars 
This will allow them to be used from elsewhere in a follow up change.

Bug: 177892522
Test: m nothing
Change-Id: I60e94e148af5b1810aea7f724cba090b49ae758e
 2021-04-26 21:21:58 +01:00
Paul Duffin
ef289f8853 Merge "Add coverage specific properties to bootclasspath_fragment" 2021-04-26 20:20:26 +00:00
Peter Collingbourne
18a53ad036 Merge "Don't print RBE stats if ANDROID_QUIET_BUILD is set." am: 19947656df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682567

Change-Id: Ia7aa15282e137e4608e2f1657c068a62db87ec0b
 2021-04-26 20:12:36 +00:00
Lukács T. Berki
6571ae1704 Merge "Reorganize and cull cc_library_static denylist." am: 2567d80414 am: a373cd60e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683872

Change-Id: Ifbf4b67223efa6a433ae2a1c0fc5a75246e4edbb
 2021-04-26 19:49:01 +00:00
Peter Collingbourne
19947656df Merge "Don't print RBE stats if ANDROID_QUIET_BUILD is set." 2021-04-26 19:47:58 +00:00
Lukács T. Berki
a373cd60e6 Merge "Reorganize and cull cc_library_static denylist." am: 2567d80414 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683872

Change-Id: I37a48a8486368019d9da34823e7b6c742a849bd0
 2021-04-26 19:24:17 +00:00
Lukács T. Berki
2567d80414 Merge "Reorganize and cull cc_library_static denylist." 2021-04-26 19:08:04 +00:00
Paul Duffin
3f81c1c71c Merge "Delegate retrieval of dex boot jar for apex to the bootclasspath_fragment" am: 46e4a9e6b1 am: 8745a28532 am: d905f6818a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686218

Change-Id: Ifea7de140ee9c69cd6afe85bbc1dfab24e446160
 2021-04-26 17:04:45 +00:00
Paul Duffin
d2ffb9f670 Merge "Extract bootclasspathFragment related code into separate functions" am: 9768678344 am: c73637a975 am: b1c2ea3c70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686217

Change-Id: Ie1063fe890d284a561ea8a1c1d62156aa42105d1
 2021-04-26 17:04:41 +00:00
Paul Duffin
3a351c3dbe Merge "Rename BootImageInfo to BootclasspathFragmentApexContentInfo" am: 71c84696f9 am: 8067ee44b3 am: 9e55ae0bd8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686216

Change-Id: I2a559dbb5dc14cfcf52407e371a0e628ac693634
 2021-04-26 17:04:27 +00:00
Paul Duffin
9d3ea7018d Merge "Remove unused setting of BootImageInfo for platform_bootclasspath" am: 00b47c4a6e am: 5fd9799be6 am: 587c558a1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686215

Change-Id: Ie77a71113bb40ad6474b1f189f6751fc9ef7c8d9
 2021-04-26 17:03:44 +00:00
Lukacs T. Berki
cba7b0c43c Reorganize and cull cc_library_static denylist. 
Test: Presubmits.
Change-Id: Ia82d5b6975fe53888798db0378635ec36b43603e
 2021-04-26 18:54:28 +02:00
Paul Duffin
d905f6818a Merge "Delegate retrieval of dex boot jar for apex to the bootclasspath_fragment" am: 46e4a9e6b1 am: 8745a28532 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686218

Change-Id: Idbad33644ef2e49fe38e3317d119dfe871404200
 2021-04-26 16:37:43 +00:00
Paul Duffin
b1c2ea3c70 Merge "Extract bootclasspathFragment related code into separate functions" am: 9768678344 am: c73637a975 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686217

Change-Id: Ie60edc778226bc95661e63f8ca5699b67df2eb56
 2021-04-26 16:37:38 +00:00
Paul Duffin
9e55ae0bd8 Merge "Rename BootImageInfo to BootclasspathFragmentApexContentInfo" am: 71c84696f9 am: 8067ee44b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686216

Change-Id: I5d86b467f47dcf281a99dc157421176aa2220570
 2021-04-26 16:37:33 +00:00
Paul Duffin
587c558a1a Merge "Remove unused setting of BootImageInfo for platform_bootclasspath" am: 00b47c4a6e am: 5fd9799be6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686215

Change-Id: I075f02fdbdeed17726654508e49256402619fe53
 2021-04-26 16:37:25 +00:00
Paul Duffin
c7d1644b0b Add coverage specific properties to bootclasspath_fragment 
This allows a bootclasspath_fragment (specifically the
art-bootclasspath-fragment) to specify additional contents to be
appended when coverage is enabled.

The art-bootclasspath-fragment will use this to add jacocoagent to its
contents to ensure that it is always consistent with the configuration.

Bug: 177892522
Test: m nothing
Change-Id: I50d05fe5e0e9b8c14bdf3dfd63bba0ac97e31d48
 2021-04-26 17:22:28 +01:00
Paul Duffin
8745a28532 Merge "Delegate retrieval of dex boot jar for apex to the bootclasspath_fragment" am: 46e4a9e6b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686218

Change-Id: I735def0776d127c90fa1130ae65fd7ce8bdd5018
 2021-04-26 16:19:09 +00:00
Paul Duffin
c73637a975 Merge "Extract bootclasspathFragment related code into separate functions" am: 9768678344 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686217

Change-Id: I6b3badd864efd11b5b32bff5ae57e6d6e80f1d02
 2021-04-26 16:18:35 +00:00
Paul Duffin
8067ee44b3 Merge "Rename BootImageInfo to BootclasspathFragmentApexContentInfo" am: 71c84696f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686216

Change-Id: I0f529c8a2bf540941833aef162bc68e4b7997f61
 2021-04-26 16:18:25 +00:00
Paul Duffin
5fd9799be6 Merge "Remove unused setting of BootImageInfo for platform_bootclasspath" am: 00b47c4a6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686215

Change-Id: Iaba42502ca9bfed51bbba4c1fb83f00880df8fea
 2021-04-26 16:17:45 +00:00
Paul Duffin
46e4a9e6b1 Merge "Delegate retrieval of dex boot jar for apex to the bootclasspath_fragment" 2021-04-26 16:12:45 +00:00
Paul Duffin
9768678344 Merge "Extract bootclasspathFragment related code into separate functions" 2021-04-26 16:12:33 +00:00
Paul Duffin
71c84696f9 Merge "Rename BootImageInfo to BootclasspathFragmentApexContentInfo" 2021-04-26 16:12:16 +00:00
Paul Duffin
00b47c4a6e Merge "Remove unused setting of BootImageInfo for platform_bootclasspath" 2021-04-26 15:42:29 +00:00
Rupert Shuttleworth
c28344a852 Add support for per-target exported includes. am: 375451edfe am: 0190e56ad0 am: cb584b1731 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686625

Change-Id: Iee0049ab7a2e129cc34ba7c3e7619dc37eab8e8c
 2021-04-26 14:25:47 +00:00
Rupert Shuttleworth
cb584b1731 Add support for per-target exported includes. am: 375451edfe am: 0190e56ad0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686625

Change-Id: Idc142124f8ce309fbfb3e0baa40e988b8f1ca9eb
 2021-04-26 13:49:29 +00:00
Rupert Shuttleworth
0190e56ad0 Add support for per-target exported includes. am: 375451edfe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686625

Change-Id: Ib1f14dba560f71314863a3a2a4fa148f4e952580
 2021-04-26 13:28:58 +00:00
Rupert Shuttleworth
375451edfe Add support for per-target exported includes. 
Test: Added unit test
Change-Id: I8ab58ddc73c15d5ec0f515e43407542bd4e8081a
 2021-04-26 07:49:08 -04:00
Paul Duffin
190fdef294 Delegate retrieval of dex boot jar for apex to the bootclasspath_fragment 
The dex boot jar for the apex must have had hidden API flags encoded
into it. Currently, the hidden API processing is done within the java
modules themselves so the apex gets the dex boot jar from them.

However, as part of the hidden API modularization work the hidden API
encoding will be performed by the bootclasspath_fragment so this change
prepares for that by delegating the retrieval of the dex boot jars to
the bootclasspath_fragment, via BootclasspathFragmentApexContentInfo.

For the moment that simply delegates straight back to the java module
so this change does not change the build. It will however make it
easier to switch hidden API encoding to the bootclasspath_fragment in
future.

Bug: 179354495
Test: m com.android.art
      - verify that this change does not change its contents
Change-Id: I12eba333749be976bcc72661bb9d6be6cc3c56e3
 2021-04-26 11:09:25 +01:00
Paul Duffin
cc33ec8838 Extract bootclasspathFragment related code into separate functions 
The apexBundle.GenerateAndroidBuildActions is 400+ lines long which
makes it difficult to understand what is happening.

Bug: 177892522
Test: m com.android.art
      - verify that this change does not change its contents
Change-Id: I07cb31d246377869771bdb18fdc6291365adf399
 2021-04-26 11:09:02 +01:00
Paul Duffin
e946b327f4 Rename BootImageInfo to BootclasspathFragmentApexContentInfo 
Currently, it only contains ART boot image related information, i.e.
.art, .oat and .vdex files. However, follow up changes will extend that
to include other information from bootclasspath_fragment.

Bug: 177892522
Test: m nothing
Change-Id: I2b226131c0eccff0c739a18f265f90caa10a91d9
 2021-04-26 10:05:27 +01:00