Commit graph

45142 commits

Author SHA1 Message Date
Serik Beketayev
af68148d19 [IRadioConfig] Add to VNDK variant list
Test: build
Bug: 198331805
Change-Id: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
Merged-In: Ibacc996f42c4bfa12b135247a2cebe1e28bbff09
2021-09-21 04:52:44 +00:00
Treehugger Robot
c41aa75dec Merge "Add tidy_disabled_srcs property." am: 1b15345ac9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831865

Change-Id: I430b1fcd21e417e1ca0382228229188e1b47c718
2021-09-21 03:58:15 +00:00
Treehugger Robot
1b15345ac9 Merge "Add tidy_disabled_srcs property." 2021-09-21 03:46:12 +00:00
Chih-Hung Hsieh
769a51cc6a Add tidy_disabled_srcs property.
Used as a supplement to C/C++ srcs to disable
clang-tidy for selected srcs, when a library
contains many files in srcs and only some of them
are too large to compile with clang-tidy.

Test: WITH_TIDY=1 TIDY_TIMEOUT=90 make tidy-soong
Bug: 198098397
Change-Id: Ib32eb0e46ddbc717999797717bfd8c57e182ee88
2021-09-20 18:17:59 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
5cc296f072 Merge changes from topic "mixed-build-cc-library-shared" am: 4aeaf37bb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826914

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

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

Change-Id: If309ce2532d679e4af9d5cfe5b4c383afa2116e2
2021-09-17 14:39:06 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
4aeaf37bb7 Merge changes from topic "mixed-build-cc-library-shared"
* changes:
  Expose TocFile via CcInfo
  Clean up StarlarkFunctionBody for getCcInfoType
  Incorporate cc_library_shared into mixed builds
2021-09-17 14:29:17 +00:00
Jingwen Chen
48a3e911c9 Merge "Remove __bp2build__ prefix trimming." am: 30204afc67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829614

Change-Id: I394b1881f71929c1567ac8631c09eb4a2702858b
2021-09-17 13:11:32 +00:00
Jingwen Chen
30204afc67 Merge "Remove __bp2build__ prefix trimming." 2021-09-17 13:01:17 +00:00
Jiakai Zhang
23a5cba0af Merge changes I9c94a54a,Idc0c73a7 am: 2c6ede11cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824513

Change-Id: I1f3ce39cd3b3988e676791a59f0c70e2bc80015d
2021-09-17 11:33:22 +00:00
Jiakai Zhang
dc2c1c2625 Merge "Revert^2 "Preopt APEX system server jars."" am: c9f9d56ed4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828115

Change-Id: I2a991341934af96455f136cbe44ef824f5e3e7f5
2021-09-17 11:33:13 +00:00
Jiakai Zhang
2c6ede11cc Merge changes I9c94a54a,Idc0c73a7
* changes:
  Preopt system server jars with updatable bootclasspath.
  Preopt APEX system server jars from prebuilts.
2021-09-17 11:20:10 +00:00
Jiakai Zhang
c9f9d56ed4 Merge "Revert^2 "Preopt APEX system server jars."" 2021-09-17 11:19:51 +00:00
Jingwen Chen
6117450ead bp2build: add converted modules to codegen metrics, and remove the
compat layer.

The list of converted modules is used for tracking bp2build progress.

The module_name_to_label aliases weren't really adding much value to
mixed builds, so let's drop the feature for now and simplify the code.

Test: CI
Test: USE_BAZEL_ANALYSIS=1 m droid
Change-Id: I3269344cfe6d1c72c108d66c6e820bc0ec19bb34
2021-09-17 08:47:16 +00:00
Jingwen Chen
16d90a8954 Remove __bp2build__ prefix trimming.
This is no longer needed after r.android.com/1792714

Test: CI
Change-Id: I808c3124cf1a4f3ebe5d25e41f346a818c3cc57c
2021-09-17 07:16:59 +00:00
Colin Cross
5ea963e60a Add support for d8 --main-dex-rules
d8 supports --main-dex-rules to replace the old mainDexClasses
script.

Test: m checkbuild
Change-Id: Ieddcf4de50cc13509c06bbffe9f1314ee3dd23b6
2021-09-16 19:14:30 -07:00
Chih-hung Hsieh
d19ed27801 Merge "Use ccCmd to generate clang-tidy dependent file" am: 935ae2c51d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824476

Change-Id: I303aab3d1318b9d94c76a362d07ec446fa65cdb0
2021-09-17 02:08:33 +00:00
Chih-hung Hsieh
935ae2c51d Merge "Use ccCmd to generate clang-tidy dependent file" 2021-09-17 01:59:23 +00:00