Commit Graph

5208 Commits

Author SHA1 Message Date
Treehugger Robot
e4795460ce Merge "Revert "Dynamically assemble the list of python launcher shared libs for precompiling"" am: 811f5c9471
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434093

Change-Id: Ifa0b594ab500b6b0e6a3e601ad542205d0f8ffc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 07:33:33 +00:00
Treehugger Robot
811f5c9471 Merge "Revert "Dynamically assemble the list of python launcher shared libs for precompiling"" 2023-02-14 07:05:50 +00:00
Cole Faust
cbeb24ce35 Merge "Add ConvertApexAvailableToTags" am: 1d09ec6fca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2431432

Change-Id: I3a062563717841fe323696bbd31c66a125e63a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 00:58:24 +00:00
Cole Faust
1d09ec6fca Merge "Add ConvertApexAvailableToTags" 2023-02-14 00:26:52 +00:00
Cole Faust
909d237c84 Revert "Dynamically assemble the list of python launcher shared libs for precompiling"
This reverts commit aa5b377ee9.

Reason for revert: this broke musl builds by removing the install dependency from python binaries to the launcher shared libraries: https://android-build.googleplex.com/builds/submitted/9600042/unit_tests_x86_64_musl/latest/view/logs/build_error.log

Change-Id: I4e13f333f287831ba13724f13ab2be789a92b476
2023-02-13 23:17:40 +00:00
Sam Delmerico
310b6023f5 Merge "pass TIDY_EXTERNAL_VENDOR envvar to Bazel" am: e56fd9467d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2431538

Change-Id: I74df3c289572e41a72be4717fedb889f6748d696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 19:37:52 +00:00
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
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
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
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
Sorin Basca
f96b899f59 Merge "Reland "Target Java 17"" 2023-02-09 14:12:14 +00: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
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
Treehugger Robot
60b3fed203 Merge "Remove unnecessary pass in validatePath." 2023-02-08 20:29:35 +00:00
Sam Delmerico
e413f4046f Merge "mixed build targets need transitive tidy files" 2023-02-08 20:11:30 +00:00
Treehugger Robot
d759f80358 Merge "Call hook in java_sdk_library after droidstubs generation" am: 667200e25b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411284

Change-Id: I883b5c4b13c233f22b6b79477ea3a6420eb2cddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 22:24:08 +00:00
Treehugger Robot
667200e25b Merge "Call hook in java_sdk_library after droidstubs generation" 2023-02-07 21:59:20 +00:00
Sam Delmerico
4ed95e263f mixed build targets need transitive tidy files
Previously in mixed builds, only the tidy files for the boundary module
were built, whereas all of its transitive dependencies' tidy files were
not being built. Instead we should export the list of transitive tidy
files for a module so that we can run clang-tidy for the boundary module
as well as its dependencies.

Bug: 195029134
Test: WITH_TIDY=1 DISABLE_ARTIFACT_PATH_REQUIREMENTS=true mss tidy-packages-modules-NeuralNetworks --bazel-mode-dev
Change-Id: I463646d2ae1fc4aa075a54c264e1c34571c3fd5c
2023-02-07 16:50:30 -05:00
Sam Delmerico
3e83b52aba Merge "export allowlist of environment variables to Bazel" am: db23e22835
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421469

Change-Id: I737c772c39100936506eafe59c86652e2169658b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 20:07:36 +00:00
Sam Delmerico
db23e22835 Merge "export allowlist of environment variables to Bazel" 2023-02-07 19:25:39 +00:00
Jihoon Kang
d48abd566b Call hook in java_sdk_library after droidstubs generation
Currently, droidstubs module create java_api_contribution module, but
when a java_sdk_library module dynamically creates a droidstubs module,
java_api_contribution is not created as the hook inside droidstubs get
lost. Therefore, call hook inside sdk_library after creating the
droidstubs module.

Test: m
Change-Id: I68bf1d796f6f9a6f81011ae35e4991b6ed1421ea
2023-02-07 18:45:38 +00:00
Jingwen Chen
24d0c56350 Remove unnecessary pass in validatePath.
Perform a single pass over pathComponents in both validatePath and
validateSafePath instead.

Test: presubmits
Change-Id: I1499183e345ca180900c54a18f9dc8bd534f2588
2023-02-07 09:29:36 +00:00
Kevin Dagostino
2c3be41226 Removing libutils_test which depends on libunwindstack.
Test: b test //system/...
Change-Id: Iceeaa5302931bb45aae4077677ceeee2f86d27a0
2023-02-07 04:11:29 +00:00
Christopher Parsons
85cae04fb2 Merge "Only write soong_injection files if changed" am: a9242e32d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2420380

Change-Id: Ie782225c3f885f4ce079c39de1542e78dbc2568b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 23:07:21 +00:00
Christopher Parsons
a9242e32d5 Merge "Only write soong_injection files if changed" 2023-02-06 22:23:54 +00:00
Sam Delmerico
cb3c52c766 export allowlist of environment variables to Bazel
Previously, Bazel was invoked during mixed builds with a stripped down
environment. This CL adds an allowlist of environment variables that are
passed to Bazel.

Test: WITH_TIDY=1 DISABLE_ARTIFACT_PATH_REQUIREMENTS=true mss tidy-packages-modules-NeuralNetworks --bazel-mode-dev
Change-Id: I23147bec59f6522953cf623e7bcaa0f1f99a75a3
2023-02-06 14:34:43 -05:00
Chris Parsons
3a8d0fbede Only write soong_injection files if changed
This also fixes determinism of these files (by ensuring that bazel
requests and their configurations are sorted, as these are used in the
soong_injection file output)

Bug: 266983462
Test: Manually verified soong_injection files are the same among
multiple runs
Test: Unit test
Test: m nothing

Change-Id: I1568930549cff0bc5676825434cc448d16ebdd4e
2023-02-03 18:29:02 -05:00
Sorin Basca
1fbf7f21a4 Reland "Target Java 17"
This reverts commit 384250c7c4.

Reason for revert: Relanding the feature.

Bug: 233029164
Change-Id: Ib66deabbf6e9604798c70edaf581f46db848e6ca
2023-02-03 18:20:03 +00:00
Cole Faust
aa5b377ee9 Dynamically assemble the list of python launcher shared libs for precompiling
Still fall back to the hardcoded list for what to put in LOCAL_SHARED_LIBRARIES,
because I couldn't figure out a good way to get those modules at the moment.

Bug: 259718110
Test: Presubmits
Change-Id: Ia992ffea8819d8c67280b08bc45505f77af09de0
2023-02-02 13:47:56 -08:00
Kelvin Zhang
991caa3576 Merge "Revert "Target Java 17"" am: d60722c204
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2419659

Change-Id: Ibdffdd1d3b1198884113e5800d311fbc52dd330b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:36:59 +00:00
Dennis Shen
0c9fc6fb7d Merge "Add soong unit test for trimmed apex build" am: a928c8dae1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412712

Change-Id: I2a849c536e409fda1573b7086febfa99c0a11348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:35:52 +00:00
Sam Delmerico
9f257daf53 Merge "clean up CL for androidmk variables" am: 1978fdf9b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2406216

Change-Id: Icf5772f6fd93f1430e8a5902283849646f93ebfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:31:58 +00:00
Sorin Basca
024f16c2f8 Merge "Target Java 17" am: ac9938dddc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2243015

Change-Id: I330481f3f67039db34bcf82ea716b80c6f29a256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:09:54 +00:00
Yu Liu
2d2c3c4564 Merge "Denylist libunwindstack for now until later." am: 249998d290
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2400013

Change-Id: I19d8fa30e313ed657f1be701ccec555fc17fe7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 20:52:39 +00:00
Kelvin Zhang
d60722c204 Merge "Revert "Target Java 17"" 2023-02-02 18:51:26 +00:00
Sorin Basca
384250c7c4 Revert "Target Java 17"
This reverts commit d6be9e51ca.

Reason for revert: b/267608166.

Change-Id: Ie07caa5ace3bcb290829e6fa476c5e1d47b975ba
Fixed: 267608166
2023-02-02 17:56:19 +00:00
Dennis Shen
a928c8dae1 Merge "Add soong unit test for trimmed apex build" 2023-02-02 14:39:53 +00:00
Sam Delmerico
1978fdf9b2 Merge "clean up CL for androidmk variables" 2023-02-02 14:11:12 +00:00
Sorin Basca
ac9938dddc Merge "Target Java 17" 2023-02-02 11:38:32 +00:00
Yu Liu
249998d290 Merge "Denylist libunwindstack for now until later." 2023-02-02 07:07:40 +00:00
Yu Liu
828c4065e1 Denylist libunwindstack for now until later.
Bug: 266446882
Test: b and m build tzdata and adbd
Change-Id: Idb931c37b082743251aae0e633fd7e51ca651a9b
2023-02-01 20:40:42 +00:00