StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,175 Commits 1 Branch 0 Tags
f3d901b71d0f768e30233d74feca0332308d917d
Commit Graph

46175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jingwen Chen
f02ef5707a Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names." am: b3c3d9a2d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831633

Change-Id: Ib004dcae1f80d6aa98f53c5be24d5c8790bc7b4f
 2021-09-21 00:37:48 +00:00
Serik Beketayev
319c773900 [IRadioConfig] Add to VNDK variant list 
Test: build
Bug: 198331805
Change-Id: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
Merged-In: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
 2021-09-20 17:32:30 -07:00
Jingwen Chen
b3c3d9a2d5 Merge "Fix bp2build-progress generating an empty converted_modules list, and duplicate module names." 2021-09-21 00:24:36 +00:00
Aurimas Liutikas
3181440486 Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e am: 2fa15f76a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I1737635d04945ef80e192059cc9c3310f1ae843b
 2021-09-21 00:07:10 +00:00
Aurimas Liutikas
2fa15f76a3 Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I8becfa1da6f0b03d0fd839b5e60b6a5f9c662821
 2021-09-20 23:53:09 +00:00
Aurimas Liutikas
e992a52d0e Merge "Enable compose kotlinc plugin when depending on the compose runtime" 2021-09-20 23:28:33 +00:00
Martin Stjernholm
531d8fdc2a Remove workaround for modules with missing BCP fragments, as they are 
present now.

#codehealth

Test: presubmits
Bug: 192868581
Change-Id: I8370525849ea589af0bf4f8d3fd081f3004516a1
 2021-09-20 23:47:24 +01:00
Colin Cross
9f7afbe3c3 Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9 am: 0abff32886 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: I5345c6934966da47268cab47fa47bb451f14f04b
 2021-09-20 20:55:23 +00:00
Colin Cross
0abff32886 Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: Ib105939a0e11dae97b40cf003c75808ee1d879ec
 2021-09-20 20:37:51 +00:00
Treehugger Robot
a437d6a959 Merge "Increase timeouts in Test_runWithTimeout" am: e646717cdf am: 728105d7b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830674

Change-Id: Ia656caa16d83945586393f1f5cf8e04508dee0ae
 2021-09-20 20:32:34 +00:00
Treehugger Robot
6db67ee4d8 Merge "Fix statusfile used in dexpreopt" am: 77cdde7d91 am: e706cc8c42 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831862

Change-Id: Iaf6edafb24170b2d87d7b9b8d82b2c61ddbdda32
 2021-09-20 20:32:28 +00:00
Colin Cross
80bb3164b9 Merge "Add support for d8 --main-dex-rules" 2021-09-20 20:22:44 +00:00
Treehugger Robot
728105d7b6 Merge "Increase timeouts in Test_runWithTimeout" am: e646717cdf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830674

Change-Id: Ia50a5b2c449d32feb150133d536a956d9e713033
 2021-09-20 20:14:37 +00:00
Treehugger Robot
e706cc8c42 Merge "Fix statusfile used in dexpreopt" am: 77cdde7d91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831862

Change-Id: I98ac9c34fa01e249a8d01ab5412c5832f4dbe389
 2021-09-20 20:14:05 +00:00
Treehugger Robot
e646717cdf Merge "Increase timeouts in Test_runWithTimeout" 2021-09-20 19:53:57 +00:00
Treehugger Robot
77cdde7d91 Merge "Fix statusfile used in dexpreopt" 2021-09-20 19:53:38 +00:00
Chris Parsons
953b35623a bp2build: reference static variants directly 
Previously, when referencing a cc_library as a static_lib from a
converted module, the corresponding target would depend on the "root
target" of that cc_library. This resulted in a superfluous dependency on
the shared target of the cc_library dependency. This superfluous
dependency could sometimes result in cycles.

This change ensures the static target name is directly specified in such
cases.

Test: mixed_libc.sh CI
Test: USE_BAZEL_ANALYSIS=1 m fmtlib
Change-Id: I36ee9f0a9017b1e9d73df9e3174669107f0afd4f
 2021-09-20 15:15:29 -04:00
Martin Stjernholm
868d052099 Merge "Show less ambiguous paths in the error when it fails to match the given output file." am: bacf6a1a6a am: e576120738 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830039

Change-Id: I84addb47dfd2aedb35fd09ba6c3bc3712a9820c8
 2021-09-20 18:32:52 +00:00
Spandan Das
3d5cd4d109 Fix statusfile used in dexpreopt 
https://android-review.googlesource.com/c/platform/build/soong/+/1820496/1/scripts/manifest_check.py#361
caused a regression wrt to statusfile creation. Specifically it inverted
the logic used to create the status file. This file is used in
dexpreopt, thereby affecting all odex files

Test: In internal git, m <an_odex_file>. File size is restored to
pre-regression value
Bug: 199921980
Bug: 200329228

Change-Id: If1e61ac8e2b95455dacc6e7b9431c8f6e1f339b3
 2021-09-20 18:24:56 +00:00
Martin Stjernholm
e576120738 Merge "Show less ambiguous paths in the error when it fails to match the given output file." am: bacf6a1a6a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830039

Change-Id: I247387b90d0508e22f24adb941b005b5a5df1b7e
 2021-09-20 18:10:48 +00:00
Martin Stjernholm
bacf6a1a6a Merge "Show less ambiguous paths in the error when it fails to match the given output file." 2021-09-20 17:44:01 +00:00
Alexander Smundak
7d15db3f46 Merge "Share version settings with product config makefile." am: dd6149122c am: 02aa596f47 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824773

Change-Id: I05d9a629d8fbe9093d6aaae67a2c4711b57e98e1
 2021-09-20 17:31:20 +00:00
Alexander Smundak
02aa596f47 Merge "Share version settings with product config makefile." am: dd6149122c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824773

Change-Id: I984f60ec4b39375db128ebb8631a3ee940337738
 2021-09-20 17:13:56 +00:00
Liz Kammer
59c0eaedca Remove arch-variant from some python properties 
Version and package should not vary based on architecture.

Test: m nothing
Change-Id: Id9cb655d9c25caee3b6068a261b3db36e1654467
 2021-09-20 12:56:17 -04:00
Alexander Smundak
dd6149122c Merge "Share version settings with product config makefile." 2021-09-20 16:56:10 +00:00
Colin Cross
a1ff7c6926 Enable compose kotlinc plugin when depending on the compose runtime 
When a module depends on the compose runtime add a -Xplugin argument
to the kotlinc flags that enables the compose compiler plugin.

Bug: 196351110
Test: TestKotlinCompose
Change-Id: I423a3c4d12df42804a24b672a40a165bc8dd165f
 2021-09-20 09:12:42 -07:00
Treehugger Robot
90a5e41516 Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e am: 45dd37c6e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: I4edcb743546c73b92fa200019994fa7891bd0003
 2021-09-20 14:34:12 +00:00
Treehugger Robot
45dd37c6e3 Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: I752f24a2e6b9763019866402a8af6adb3e96ee2a
 2021-09-20 14:20:18 +00:00
Treehugger Robot
3769a27c5e Merge "Add test to TestJavaStableSdkVersion for legacy core platform" 2021-09-20 14:04:35 +00:00
Martin Stjernholm
dde2a3e537 Merge changes I464e6ebd,Iaf7655e4 am: 3536614edd am: 804f4d1117 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826777

Change-Id: I9844dc471914060913c7f39d8c57b66132038bd3
 2021-09-20 13:33:56 +00:00
Martin Stjernholm
804f4d1117 Merge changes I464e6ebd,Iaf7655e4 am: 3536614edd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826777

Change-Id: I7e03d04afbc809544d964548caa1646bc36aa353
 2021-09-20 13:17:53 +00:00
Martin Stjernholm
a4aaa47a00 Show less ambiguous paths in the error when it fails to match the given 
output file.

PathRelativeToTop should give an unambiguous path that can be used for
matching, as opposed to Rel().

Test: `m nothing` with a test with an invalid Output() call
Change-Id: I6d501df6acb0a1700f1480bd4250320f69278c39
 2021-09-20 14:17:09 +01:00
Martin Stjernholm
3536614edd Merge changes I464e6ebd,Iaf7655e4 
* changes:
  Make it possible to pass an error message with an invalid optional path.
  Replace OptionalPath.valid flag by checking the path itself.
 2021-09-20 13:03:20 +00:00
Martin Stjernholm
c32dd1c0ab Make it possible to pass an error message with an invalid optional path. 
This is useful to delay errors until the paths need to be used.

Test: m nothing
Change-Id: I464e6ebd04b06c5e17617e8ee4e65a3320f1168f
 2021-09-20 14:02:11 +01:00
Martin Stjernholm
2fee27f3c9 Replace OptionalPath.valid flag by checking the path itself. 
Test: m nothing
Change-Id: Iaf7655e4676d2beeb7c7ac3bcba11a7dad4a01a3
 2021-09-20 14:02:11 +01:00
Jingwen Chen
310bc8f5f4 bp2build: Refactor metrics collection to use exported functions. 
This CL splits the metric count into handcrafted, generated, and
unconverted modules.

Test: CI
Test: m bp2build, the metrics reported are identical.
Change-Id: I80e3d2fd2989222bd40b6433b4a1924b4943d0ba
 2021-09-20 11:54:00 +00:00
Jingwen Chen
afb84bd78f Fix bp2build-progress generating an empty converted_modules list, and 
duplicate module names.

We were using the value receiver on AddConvertedModule before, which
didn't actually mutate the internal slice state.

Test: Run bp2build-progress.py
Change-Id: Ic60f8f6214a91dc129abf62c57dd0b85efffb283
 2021-09-20 10:31:46 +00:00
Jingwen Chen
21faa01d97 Merge "bp2build: add converted modules to codegen metrics, and remove the compat layer." am: 0c7ca97876 am: ef018949e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829434

Change-Id: I364e296ae0ade6f712558a7bda60f23c30b1a959
 2021-09-20 09:06:29 +00:00
Jingwen Chen
ef018949e9 Merge "bp2build: add converted modules to codegen metrics, and remove the compat layer." am: 0c7ca97876 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829434

Change-Id: I8fafea4ca2c251cca058aa8c03aff7ce84930d73
 2021-09-20 08:44:00 +00:00
Jingwen Chen
0c7ca97876 Merge "bp2build: add converted modules to codegen metrics, and remove the compat layer." 2021-09-20 08:27:34 +00:00
Martin Stjernholm
50cd21f685 Add a function to match modules through a variation map. am: 14cdd71152 am: f9dd87304f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825132

Change-Id: I6bb23cdfb6bc48db3471287d203ecced1eeff6b6
 2021-09-18 01:12:46 +00:00
Martin Stjernholm
f9dd87304f Add a function to match modules through a variation map. am: 14cdd71152 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1825132

Change-Id: I9b6765ee40d47bb9470bdb0f0f09bb572d700343
 2021-09-18 00:48:46 +00:00
Martin Stjernholm
14cdd71152 Add a function to match modules through a variation map. 
Can be a more convenient alternative than specifying the full subdir
concatenation of the variants. E.g. common arch and os variations don't
have to be hardcoded.

Test: `m nothing` with https://r.android.com/1801128
Change-Id: Ic2966e109d61dfee6a2b4fcbcbf8f73274babca9
 2021-09-17 23:52:03 +01:00
Zach Johnson
d6ab4dff5f Add NFC to the Rust allowlist am: 5145e9d917 am: a87f8bfd7f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829921

Change-Id: I6b2b7772f4ef03cadbe642b17ddf315b77cb4ae3
 2021-09-17 22:23:40 +00:00
Zach Johnson
a87f8bfd7f Add NFC to the Rust allowlist am: 5145e9d917 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829921

Change-Id: I38cc7ffe43b783f5cd4c461cbe4423cfe5f25cbf
 2021-09-17 22:09:29 +00:00
Colin Cross
2f08bc1a5c Increase timeouts in Test_runWithTimeout 
Under load sometimes the 1 millisecond timeouts are not run before
a 1 second sleep finishes, or `echo foo` is not run before a 1
second timeoutt.  Increase the long sleeps and timeouts to 10 seconds.
This doesn't affect normal test runtime as the command should timeout
after 1 millisecond.

Bug: 199207577
Test: Test_runWithTimeout
Change-Id: I31166850a473b9cde37906a62d026580e7a7bd3f
 2021-09-17 21:36:29 +00:00
Zach Johnson
5145e9d917 Add NFC to the Rust allowlist 
rustfmt & preupload checks are being checked in shortly

Bug: 197333653
Test: compile
Change-Id: I91f14dc9a58d04fda6ae77de2ea5d85f481d0563
 2021-09-17 12:08:44 -07:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
9aa94951a3 Merge changes from topic "mixed-build-cc-library-shared" am: 4aeaf37bb7 am: 5cc296f072 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826914

Change-Id: I82ae3a1af90d4fba809e6e3fd042f75b6cc4a355
 2021-09-17 14:53:47 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
12485472ec Clean up StarlarkFunctionBody for getCcInfoType am: 4fbc62196d am: 8e773669ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826913

Change-Id: I9354d0292ec95538eee8fc31cdb80e36efff5e10
 2021-09-17 14:53:46 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
f4718aefa7 Incorporate cc_library_shared into mixed builds am: bc4e734e59 am: 5ce0135bd8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826912

Change-Id: Ic49d221901bc2db0d817cff38bdb0bc3838807d3
 2021-09-17 14:53:45 +00:00