Commit Graph

63527 Commits

Author SHA1 Message Date
Cole Faust
bcd201e86c Merge "Dynamically assemble the list of python launcher shared libs for precompiling" am: 8b0c15b083
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2419263

Change-Id: I9b093629fc66f094aa6fbe5b01ca44aeffc4d1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 19:36:54 +00:00
Sam Delmerico
e56fd9467d Merge "pass TIDY_EXTERNAL_VENDOR envvar to Bazel" 2023-02-13 19:02:29 +00:00
Cole Faust
8b0c15b083 Merge "Dynamically assemble the list of python launcher shared libs for precompiling" 2023-02-13 18:25:08 +00:00
Cole Faust
fb11c1ce81 Add ConvertApexAvailableToTags
This is a more flexible version of ApexAvailableTags
that can be used for the aidl modules.

Bug: 260694842
Test: go test
Change-Id: Iddb15e737c19e95977f74e8c627d6044d8875746
2023-02-13 10:23:36 -08:00
Chris Wailes
a109706de9 Merge "rustc-1.66.1 Build 9591243" am: 97ce82e30f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2431036

Change-Id: Ia898ef293de6f582758b24f0592467b1025f9158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 17:46:31 +00:00
Chris Wailes
97ce82e30f Merge "rustc-1.66.1 Build 9591243" 2023-02-13 17:05:12 +00:00
Treehugger Robot
2e25039c2f Merge "Write product config files only if changed." am: 8916b21320
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421759

Change-Id: Id4aec4a75093fccac6045988d04592cfc0fd8fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 04:45:03 +00:00
Treehugger Robot
8916b21320 Merge "Write product config files only if changed." 2023-02-11 03:59:01 +00:00
Chris Parsons
7f3bf453cb Avoid rewriting soong_build outputs if unchanged am: 1a12d03230
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2424625

Change-Id: I1d6ff45df2954dbae88d05fb846227ce9e3708a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 01:04:31 +00:00
Sam Delmerico
700b4d3e1a pass TIDY_EXTERNAL_VENDOR envvar to Bazel
Bug: 268668248
Test: verify that Bazel tidy actions don't have a large diff from Soong tidy actions:
  (add -v to Ninja invocation in ui/build/ninja.go [and disable fifo file])
  WITH_TIDY=1 DISABLE_ARTIFACT_PATH_REQUIREMENTS=true m com.android.adbd 2>&1 | tee soong_build-tidy.adbd &&
  WITH_TIDY=1 DISABLE_ARTIFACT_PATH_REQUIREMENTS=true m com.android.adbd --bazel-mode-staging 2>&1 | tee mixed_build-tidy.adbd &&
  grep -Po "prebuilts/clang/host/linux-x86/clang-r475365b/bin/clang-tidy.sh \K\S+" soong_build-tidy.adbd | sort -u > soong-clang-tidy.adbd &&
  grep -Po "prebuilts/clang/host/linux-x86/clang-r475365b/bin/clang-tidy.sh \K\S+" mixed_build-tidy.adbd | sort -u > mixed-clang-tidy.adbd &&
  vimdiff soong_build-tidy.adbd mixed_build-tidy.adbd
Change-Id: I22804d6d92ed56d9727eaf430318df0b041712a8
2023-02-10 16:46:33 -05:00
Chris Parsons
0008cf8b24 Write product config files only if changed.
Test: Manually verified artifact timestamps are unchanged on a second
invocation of `m nothing` (with bp changes)
Test: Presubmits

Change-Id: I6bdf106a464597a07ac290cb575425d700721ffe
2023-02-10 16:03:26 -05:00
Chris Parsons
1a12d03230 Avoid rewriting soong_build outputs if unchanged
This changes bp2build codegen, symlink forest generation, and
soong_build so that they do not rewrite output files if the contents are
unchanged.

Bug: 266983462
Test: m droid
Test: canonical_perf.sh benchmarking
Test: Manually verified that rerunning analysis did not regenerate
out/soong/workspace/prebuilts/sdk/BUILD.bazel unless contents changed

Change-Id: I5ec227df7a32b53c7fa0d741fb1403a51931024b
2023-02-10 15:34:06 -05:00
Trevor Radcliffe
cb7c448066 Add test that LTO isn't propagated to runtime_libs
Bug: 261733821
Test: It is a test
Change-Id: I2cda89dc53d6eaa51c756f552d990169a280b053
2023-02-10 20:29:20 +00:00
Chris Wailes
7ebba7ebf9 rustc-1.66.1 Build 9591243
Bug: https://issuetracker.google.com/issues/263153841
Test: m rust
Change-Id: I3927163f7df2bacb2096328d0557acf9c9668b77
2023-02-10 12:24:41 -08:00
Jiakai Zhang
ec521c3c31 Merge "Properly check the deapexed files in tests." am: 871109e91d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2430172

Change-Id: I3459c1a1a49812df0a421f02942c01af96df47bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 16:25:06 +00:00
Jiakai Zhang
871109e91d Merge "Properly check the deapexed files in tests." 2023-02-10 15:18:37 +00:00
Jiakai Zhang
ebf48bf1e2 Properly check the deapexed files in tests.
The tests in bootclasspath_fragment_test setup the environment to have
two APEXes: a source one and a prebuilt one. Before this change, the
tests for prebuilt incorrectly check the contents in the source one.
This change introduces a new function that properly checks files
deapexed from the prebuilt one.

Bug: 241823638
Test: m nothing
Change-Id: I1865c20b198d50e7ebc8ebfb9f7c71394a225ab7
2023-02-10 23:13:41 +08:00
Jingwen Chen
4daf260365 Check that apex#filesInfo is not nil in mixed bazel/soong mode. am: 2d7f6fdfa6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421199

Change-Id: Iea7ffa7879578461ea0390d2b6828061fb961175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 12:27:17 +00:00
Jingwen Chen
2d7f6fdfa6 Check that apex#filesInfo is not nil in mixed bazel/soong mode.
filesInfo should not be used for an apex that's converted to Bazel,
since all information should come from the Bazel starlark provider.
filesInfo is populated when there's a full Android.bp module graph of
the apex deps.

Test: presubmits
Change-Id: I4b9c596ca7841f4ea76e21f929039282113b6752
2023-02-10 08:07:41 +00:00
Colin Cross
5f52d50e9b Merge "Fix test so it works on mac" am: f5d42a206f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2429133

Change-Id: I752c7bfc14b2e3fbb5b1edc1414fdf872630ed82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 05:20:51 +00:00
Colin Cross
f5d42a206f Merge "Fix test so it works on mac" 2023-02-10 05:00:02 +00:00
Treehugger Robot
6e32c60082 Merge "Enable -Wnull-dereference globally" am: e86ef598d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2423026

Change-Id: I6df7486a42d5d9454f9be91f168b45e2b1fb75c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 23:12:55 +00:00
Treehugger Robot
e86ef598d5 Merge "Enable -Wnull-dereference globally" 2023-02-09 22:37:21 +00:00
Kevin Dagostino
f5e54f0959 Merge "Removing libutils_test which depends on libunwindstack." am: 7d4e3be8e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2424626

Change-Id: I9c837e93283a1b78d90c8ac5bc7f7356112da127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 20:56:29 +00:00
Kevin Dagostino
7d4e3be8e6 Merge "Removing libutils_test which depends on libunwindstack." 2023-02-09 20:20:50 +00:00
Cole Faust
21f74f582d Merge "Export apex_available_baseline to soong_injection" am: aafdf54f70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2427237

Change-Id: I852cffbc856d44b8ae9be9419498b50134718ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 19:16:44 +00:00
zijunzhao
2863c0a40c Enable -Wnull-dereference globally
Bug: b/29823425
Test: m
Change-Id: I8d73cbc92b06829d8b937af262298d54c7697404
2023-02-09 19:05:09 +00:00
Trevor Radcliffe
e22f384f3c Fix test so it works on mac
Bug: 261733821
Test: The change is a test
Change-Id: I5cc15f642260b34d54840921941e6e56ef75d561
2023-02-09 19:01:31 +00:00
Cole Faust
aafdf54f70 Merge "Export apex_available_baseline to soong_injection" 2023-02-09 18:39:27 +00:00
Seth Moore
d595fdc9a8 Merge "Allow android tests to specify a mainline package name" am: bc6dc9f546
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2419560

Change-Id: Ic45dc2d792cab6b40841825c6240c7fe0327d9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 16:18:48 +00:00
Seth Moore
bc6dc9f546 Merge "Allow android tests to specify a mainline package name" 2023-02-09 15:43:08 +00:00
Ajinkya Chalke
e7709e29ab Merge "Revert "Don't ignore R8 warnings for optimized targets"" am: a9728cfa39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2429092

Change-Id: I814294fdb40ebfd2bfa0b697b7c37b7a94deea7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 14:43:42 +00:00
Sorin Basca
542f261172 Merge "Reland "Target Java 17"" am: f96b899f59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421499

Change-Id: Ib6d8322941f66d102ad599950bcdbe8f1c020b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 14:43:09 +00:00
Ajinkya Chalke
a9728cfa39 Merge "Revert "Don't ignore R8 warnings for optimized targets"" 2023-02-09 14:37:38 +00:00
Sorin Basca
f96b899f59 Merge "Reland "Target Java 17"" 2023-02-09 14:12:14 +00:00
Ajinkya Chalke
ddad41b912 Revert "Don't ignore R8 warnings for optimized targets"
This reverts commit 5c2a1f3bda.

Reason for revert: This change is causing the build to break, see http://b/268404998

Change-Id: I9173d1aa42846831123273ef7651940f2b0d6608
2023-02-09 14:09:58 +00:00
Jooyung Han
1866e0e165 Merge "Revert "Revert "Remove apex.apex_name""" am: 9b293af098
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2428252

Change-Id: If8848b840b31fb7a4b1620c9a998c16ba55f096b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 09:15:08 +00:00
Jooyung Han
9b293af098 Merge "Revert "Revert "Remove apex.apex_name""" 2023-02-09 08:46:12 +00:00
Jason Wu
6e9ea5eb1b Upload soong_metrics when mixed build fails am: 51d0ad7c30
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2427294

Change-Id: I8f06f77d3978b1b462a7d5be86a04d04ade013dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 06:01:11 +00:00
Cole Faust
9e384e2e6b Export apex_available_baseline to soong_injection
So that it can be used in the bazel implementation.

Bug: 268006095
Test: m nothing, check that it's in out/soong/soong_injection
Change-Id: I1520dd874076dee7fa083648d0790b060d658e5a
2023-02-08 17:43:09 -08:00
Jooyung Han
63dff468d0 Revert "Revert "Remove apex.apex_name""
This reverts commit d1209a89c7.

Reason for revert: apex_name was still in use in the internal/intermediate branch. Fixed(removed apex_name) in the internal branch.

Change-Id: I10b8e0cfdb01dcdb6b623bddf9c04f4dac71fc90
2023-02-09 00:11:27 +00:00
Jason Wu
51d0ad7c30 Upload soong_metrics when mixed build fails
Test:  `m --bazel-mode-dev` and intentionally break the build.
We can see soong_metrics in the output directory and metrics_uploader
executed.

Bug: 268228148
Change-Id: I79e3b11468fca446673ebf752697a99eaff01b0f
2023-02-08 18:13:43 -05:00
Treehugger Robot
c29c3ad951 Merge "Remove unnecessary pass in validatePath." am: 60b3fed203
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2424707

Change-Id: I83c80f6198da3664ccca873f1cd483aa5d14e2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 21:09:51 +00:00
Yi Kong
c534b3430e Merge "Migrate to the new clang lib dir" am: aa0833a8fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2426152

Change-Id: I42b1290e081d2a6e2ac9be274feb742545f5bbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 21:09:02 +00:00
Trevor Radcliffe
e4e82b4d81 Merge "Add test for LTO edge case" am: 41d0539715
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2425474

Change-Id: Ia06522a96c2ba556ba754cb96fe97d5bf3e6a61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 21:08:51 +00:00
Treehugger Robot
76ea6479d6 Merge "Don't ignore R8 warnings for optimized targets" am: aa97f1dc6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366612

Change-Id: I4ca81118c0b06f086b96d61b73aa8f45f94edc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 21:08:39 +00:00
Sam Delmerico
8e305ef1af Merge "mixed build targets need transitive tidy files" am: e413f4046f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421470

Change-Id: Id21d4d2c8e2eddb5e80effd2c5256c4e9eb94ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 21:07:32 +00:00
Seth Moore
c6f4b532f3 Allow android tests to specify a mainline package name
Tests that run against mainline modules generally need to be built
twice: once for aosp (unsigned) and once for internal (signed).
The override_android_test rule is really useful for generating a
signed version of the unsigned test.

However, mainline tests need to use a MainlineTestModuleController
to only run tests on targets with the expected module. Since unsigned
and signed mainline modules have different package names, this means
the test config needs to be updated when overriding a test.

Add a new "mainline_package_name" argument so that android test rules
can update the targeted mainline package. Without this, the only way
to create a mainline package test is to instead use android_test, which
results in a lot of copy-pasta.

Test: added tests to soong
Test: manual, using a locally-modified RkpdAppUnitTest
Test: test_config_fixer_test.py
Change-Id: Idaffd63f225719a2bfda41018fda630b17db0080
2023-02-08 12:38:50 -08:00
Treehugger Robot
60b3fed203 Merge "Remove unnecessary pass in validatePath." 2023-02-08 20:29:35 +00:00
Yi Kong
aa0833a8fb Merge "Migrate to the new clang lib dir" 2023-02-08 20:29:17 +00:00