Commit Graph

50375 Commits

Author SHA1 Message Date
Colin Cross
a1a1d6051a Support experimental building with OpenJDK 17 am: 59c1e6ac0e am: 6984e882eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2006781

Change-Id: I047d0d8fc65d565108c20c8b0092b3f7584ca01e
2022-03-05 03:04:44 +00:00
Colin Cross
6984e882eb Support experimental building with OpenJDK 17 am: 59c1e6ac0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2006781

Change-Id: I2e7c2335299034ea07f55c4b1615f67bbe1deed6
2022-03-05 02:41:19 +00:00
Colin Cross
59c1e6ac0e Support experimental building with OpenJDK 17
Use EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true to build with OpenJDK 17
while still targeting java language version 11.

Bug: 219098645
Test: m EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true
Change-Id: I89fb04ecde4dbd1e102098f316692624dd67f8a2
2022-03-04 21:40:02 +00:00
Treehugger Robot
6c5cab3cfc Merge "prevent module being enabled if in existing BUILD file" am: fe86b81aab am: 6e826bab74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1999892

Change-Id: I1504e298afa70176ac76fa93e44ef317dc736606
2022-03-04 21:28:06 +00:00
Treehugger Robot
6e826bab74 Merge "prevent module being enabled if in existing BUILD file" am: fe86b81aab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1999892

Change-Id: I0cca195fe44e4360006183a6d5c2203d5ea6bdde
2022-03-04 21:04:10 +00:00
Treehugger Robot
fe86b81aab Merge "prevent module being enabled if in existing BUILD file" 2022-03-04 20:37:21 +00:00
Sam Delmerico
19b7975f03 Merge "convert android_app certificate property, bp2build" am: d508a638c3 am: 9e3f98b8cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980606

Change-Id: Ie872a9e2e027209e7b450c02b2513dd506a81e3f
2022-03-04 18:18:41 +00:00
Sam Delmerico
9e3f98b8cf Merge "convert android_app certificate property, bp2build" am: d508a638c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980606

Change-Id: I38f798fa387b10288abb4250e9f941776e98088c
2022-03-04 17:56:28 +00:00
Sam Delmerico
d508a638c3 Merge "convert android_app certificate property, bp2build" 2022-03-04 17:30:31 +00:00
Kousik Kumar
572bb8ce25 Merge "Allowlist stubby to be run within the path imposer" am: 376cd24d14 am: 1170739206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2007970

Change-Id: I305aea9d1845ff5df65e88b14fdfcde5414af54b
2022-03-04 16:50:42 +00:00
Kousik Kumar
1170739206 Merge "Allowlist stubby to be run within the path imposer" am: 376cd24d14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2007970

Change-Id: If2f27a5e56021072dccc50742f0c8d29c59ef827
2022-03-04 16:28:16 +00:00
Kousik Kumar
376cd24d14 Merge "Allowlist stubby to be run within the path imposer" 2022-03-04 16:01:52 +00:00
Treehugger Robot
038ec99cd7 Merge "Export binaries for shippedlibs and bom." am: 7010c53c50 am: 265f41c1dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003174

Change-Id: I32fbb0349db50fddaa29a3ae7a42ed93b5c16469
2022-03-04 03:12:41 +00:00
Treehugger Robot
265f41c1dc Merge "Export binaries for shippedlibs and bom." am: 7010c53c50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003174

Change-Id: I5bd08c769c24638c068aed8f99e4d6d355fbfa74
2022-03-04 02:50:26 +00:00
Treehugger Robot
7010c53c50 Merge "Export binaries for shippedlibs and bom." 2022-03-04 02:23:38 +00:00
Christopher Parsons
bde8554eed Merge "Report mkfile metrics with --mk-metrics" am: cb59ea7b2f am: 43dc26bdab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2007510

Change-Id: Ia6f6517355f6957c73d80ab873778f08d5a918f5
2022-03-03 22:37:30 +00:00
Christopher Parsons
43dc26bdab Merge "Report mkfile metrics with --mk-metrics" am: cb59ea7b2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2007510

Change-Id: I57fc5494dd21a2178626dce1005379877e0520e0
2022-03-03 22:15:28 +00:00
Christopher Parsons
cb59ea7b2f Merge "Report mkfile metrics with --mk-metrics" 2022-03-03 21:51:29 +00:00
Chris Parsons
53f68ae3b8 Report mkfile metrics with --mk-metrics
Combined with roboleaf CI changes to pass this flag and subsequent
pipeline changes, this will allow basic mkfile metrics to be
dashboarded, which will help track mk2bp progress.

Bug: 217764943
Test: manual; verified mk_metrics.pb is generated iff --mk-metrics is
specified, used printproto on result

Change-Id: I348994b4d7e3479d0dc04de0276b94a702aac95b
2022-03-03 15:28:20 -05:00
Cole Faust
6e6cb7d423 Merge "Fix include paths that match one file being included unconditionally" am: 560834669e am: 9d7a52dbde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2004901

Change-Id: I0c4c275d9ace207099ebcfec220f31d2d084998c
2022-03-03 20:09:11 +00:00
Kousik Kumar
9eb43e26c4 Allowlist stubby to be run within the path imposer
To support using google prod credentials for Google developers, we need
to be able to make an RPC call to exchange credentials. This RPC call
needs to be issued via stubby and hence allowlisting the stubby binary.

dwillemsen@ also pointed out that this should be less effective for
other tools running within the build since network access is disabled
for the other tools anyway via sandboxing.

Bug: b/222484146
Change-Id: I29aec9576e86b9ed3051df7943404abd478c549b
2022-03-03 15:07:32 -05:00
Cole Faust
9d7a52dbde Merge "Fix include paths that match one file being included unconditionally" am: 560834669e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2004901

Change-Id: Ica5e38108d70452ade7df029f316f7e98495c219
2022-03-03 19:45:20 +00:00
Rob Seymour
6e91b15053 Merge "Add JSON module graph to dist" am: 5e0278ea96 am: 912a9b7478
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2006213

Change-Id: I2e12712bedecd3cae59a551444fb17cb14dbaff3
2022-03-03 19:35:42 +00:00
Cole Faust
560834669e Merge "Fix include paths that match one file being included unconditionally" 2022-03-03 19:22:17 +00:00
Rob Seymour
912a9b7478 Merge "Add JSON module graph to dist" am: 5e0278ea96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2006213

Change-Id: I4e1de159d478102f9dc13ee8167f2244aa54b8c8
2022-03-03 19:11:10 +00:00
Liz Kammer
1bf0a42c98 Merge "Export variant/features via soong_injection" am: 6e4cd27bec am: a1b33112b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2000396

Change-Id: I6b403e30a36113a4bda62eef6d94f58c5f79e9ed
2022-03-03 18:59:55 +00:00
Rob Seymour
5e0278ea96 Merge "Add JSON module graph to dist" 2022-03-03 18:47:51 +00:00
Liz Kammer
a1b33112b1 Merge "Export variant/features via soong_injection" am: 6e4cd27bec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2000396

Change-Id: I6da248db7bca983d0ce5b121412f904e48f67a21
2022-03-03 18:36:17 +00:00
Liz Kammer
6e4cd27bec Merge "Export variant/features via soong_injection" 2022-03-03 18:11:25 +00:00
Charisee Chiw
1d20db2695 Merge "Update RustDefaultVersion to 1.59.0" am: 81be410e07 am: 927d949035
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003172

Change-Id: Ia24ed5269914cb4c55f4c0be70863e06c787b3a1
2022-03-03 05:47:32 +00:00
Charisee Chiw
927d949035 Merge "Update RustDefaultVersion to 1.59.0" am: 81be410e07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003172

Change-Id: Iac018fd040d943745086f0f48667409e2f1d216e
2022-03-03 05:15:33 +00:00
Charisee Chiw
81be410e07 Merge "Update RustDefaultVersion to 1.59.0" 2022-03-03 04:52:38 +00:00
Remi NGUYEN VAN
e355a8aefb Merge "Support overriding APEX java contents" am: 979b652dec am: 285ce79db5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2005472

Change-Id: Iab09a8281fd0306b7c02255d9f465004a4c05a64
2022-03-03 02:21:33 +00:00
Remi NGUYEN VAN
285ce79db5 Merge "Support overriding APEX java contents" am: 979b652dec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2005472

Change-Id: Ic61f91405cdc67544468dd9431e2aad2cc1ad83b
2022-03-03 01:57:03 +00:00
Remi NGUYEN VAN
979b652dec Merge "Support overriding APEX java contents" 2022-03-03 01:26:19 +00:00
Rob Seymour
33cd10d745 Add JSON module graph to dist
Test: m json-module-graph dist nothing
Change-Id: I2a8a89cc5fb767365c9ba92dccc4509c41c6bbb5
2022-03-02 23:12:37 +00:00
Treehugger Robot
9ee71e07dc Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" am: 7ed6612fa6 am: 9688f00e3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2004236

Change-Id: Iba77aa31bd05a786b02a5bc8a0e5a0b565317b6b
2022-03-02 23:03:55 +00:00
Treehugger Robot
9688f00e3a Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" am: 7ed6612fa6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2004236

Change-Id: I9401f672367864c89afdee750fa910f9ba217409
2022-03-02 22:42:16 +00:00
Sam Delmerico
94d26c2bc0 prevent module being enabled if in existing BUILD file
If a module is enabled via the module-level allow list,
bp2buildModuleAlwaysConvertList, then we should error if that same
module is hidden by an existing BUILD file.

Bug: 220875679
Test: add a module in a directory covered by an existing BUILD file
Change-Id: I5426bd9edac593690c0989b68a421ac1c3216010
2022-03-02 22:15:14 +00:00
Treehugger Robot
7ed6612fa6 Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" 2022-03-02 22:14:16 +00:00
Cole Faust
93f8d3987a Fix include paths that match one file being included unconditionally
In aosp/1962181 an "optimization" was added where if an include
path with a variable only matches one file, that file would be
called directly instead of going through the whole _entry
variable.

This doesn't work when there is an inherit-product-if-exists call
that matches one file, but that file isn't the one that is specified
at runtime. In reality, the inherit-product-if-exists call should
see that the file doesn't exist and not include anything.

Fixes: 222341691
Test: go test
Change-Id: If8789de0013726137683078355161eecdec009b1
2022-03-02 13:31:30 -08:00
Usta Shrestha
902fd17a99 ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz
Bug: 222133546
Test: `rm -rf out` then `USE_BAZEL_ANALYSIS m libnativehelper` and ensure 'out/bazel_metrics' exists
Change-Id: I6803aba830e1c40f3618bfc41109728d721fd2af
2022-03-02 15:27:49 -05:00
Charisee
5ddec43280 Update RustDefaultVersion to 1.59.0
bug: 215232614
Test: TreeHugger and compiling with m rust
Change-Id: Ia60c77637ab2e41844010e021656fad0870013ac
2022-03-02 19:54:47 +00:00
Cole Faust
413e73cee1 Merge "Convert add-product-dex-preopt-module-config to Starlark" am: fc74246c98 am: a25eeab5e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002770

Change-Id: Id0185496888cc6c7c2903da23abb4ef06cb46fbf
2022-03-02 19:32:14 +00:00
Cole Faust
a25eeab5e1 Merge "Convert add-product-dex-preopt-module-config to Starlark" am: fc74246c98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002770

Change-Id: Ic7d041f29438ef77a9395ec4e0ccfa0238a62149
2022-03-02 19:07:52 +00:00
Cole Faust
fc74246c98 Merge "Convert add-product-dex-preopt-module-config to Starlark" 2022-03-02 18:40:36 +00:00
Liz Kammer
96afab7fcb Merge "Improve clarity of arch decoding." am: b3fe72fc78 am: cda3d14ad8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002771

Change-Id: I925dc12c8b3c95f4e32d618f58b8a6094d18bb86
2022-03-02 16:25:55 +00:00
Liz Kammer
cda3d14ad8 Merge "Improve clarity of arch decoding." am: b3fe72fc78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002771

Change-Id: Ibeb07556427c29a0d4a1a9b099b8c6b83783304a
2022-03-02 16:04:45 +00:00
Liz Kammer
b3fe72fc78 Merge "Improve clarity of arch decoding." 2022-03-02 15:44:26 +00:00
Remi NGUYEN VAN
be90172f0a Support overriding APEX java contents
In addition to the current "apps", support overriding
bootclasspath_fragments, systemserverclasspath_fragments, and java_libs.

This is useful to build APEXes with slightly different contents, for
example where the base APEX could contain libraries that only use stable
APIs, but the overriding APEX could contain a variant that also uses
non-finalized APIs.

Bug: 222247869
Test: m (runs apex tests)
Change-Id: I14da6f835c58b44be31e517598695ec8ff830648
2022-03-02 21:23:15 +09:00