Kousik Kumar
a902250962
Merge "Update symlinks in output directory when TOP dir changes" into main
2023-10-05 13:29:20 +00:00
Kousik Kumar
7983cc2876
Use make_mock_top function
...
Followup cleanup CL to address the comments from https://android-review.git.corp.google.com/c/platform/build/soong/+/2757787
Bug: b/300498226
Change-Id: If07e1fb21e97bd4b7550d29eaf7736b5894d797f
2023-10-05 13:06:09 +00:00
Jingwen Chen
863e33471a
Delete some api_bp2build dead code.
...
Follow up of https://android-review.googlesource.com/2630914
Bug: 284029211
Test: presubmits
Change-Id: Idc0ff2f20e54b81cfdf61472a72e9cb027f60554
2023-10-05 10:23:58 +00:00
Jingwen Chen
8c49fc7cac
Fix comment for Bp2buildDepsMutator config.
...
Test: presubmit
Change-Id: I5c7f1fc188eb37d3a457f9d4e2365d89ce2190e9
2023-10-05 10:07:52 +00:00
Jingwen Chen
3e582b8175
Use parameter name hint for BazelLabelModuleDepsWithFn's markAsDeps.
...
Test: presubmits
Change-Id: I6015581c27ad8b9b5b81d0ed01ba219699b9630b
2023-10-05 10:03:06 +00:00
Jingwen Chen
464e6a083f
Small readability refactor for bp2buildDepsMutator.
...
Test: presubmits
Change-Id: I59bc943cf8c3419bf16a7053d967d464f9f40f21
2023-10-05 09:59:43 +00:00
Yi Kong
577a73a22d
Change lto_test to use GlobalThinLTO configuration
...
This is now the default, and we will be removing non-GlobalThinLTO configuration.
Also changed handling for lto: never, it doesn't need to create an
lto-none variant.
Change-Id: I971baa920df867fb762923d925eed22215a89c27
Test: presubmit
2023-10-05 05:05:40 +00:00
Kiyoung Kim
25ee09b5b6
Merge "Do not allow a module exists both in provideLibs and requireLibs" into main am: f2fd12d97c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762828
Change-Id: I9e576f8495ca392093d51b2b330fe61da5373ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 04:27:36 +00:00
Kiyoung Kim
f2fd12d97c
Merge "Do not allow a module exists both in provideLibs and requireLibs" into main
2023-10-05 03:54:36 +00:00
Treehugger Robot
dc02013beb
Merge "Add more information to the ABI error message." into main am: 98b3cb2787
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773847
Change-Id: I59841cfdeb119aeb2cbd19c971d61bf7773a2ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 02:36:22 +00:00
Treehugger Robot
ad5c8c1460
Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main am: 65a06d460f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773845
Change-Id: Iabfb5fcfe84f3bfeaaa7e7dd6f83600176935d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 02:36:10 +00:00
Spandan Das
93cc736f1e
Merge "Create bp2build converter for versioned_ndk_headers" into main am: ee557e4c69
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769119
Change-Id: Ie4240b71b3089ba3fa771ce122fe34c9d6a4f15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 02:35:54 +00:00
Treehugger Robot
98b3cb2787
Merge "Add more information to the ABI error message." into main
2023-10-05 02:28:23 +00:00
Treehugger Robot
65a06d460f
Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main
2023-10-05 02:22:17 +00:00
Spandan Das
ee557e4c69
Merge "Create bp2build converter for versioned_ndk_headers" into main
2023-10-05 02:00:55 +00:00
Kiyoung Kim
3df5f50e1a
Do not allow a module exists both in provideLibs and requireLibs
...
There was an issue that a library installed in the system with stub is
manually marked as requireLibs, so it created link to the self (system)
namespace from linkerconfig. This change checks from conv_linker_config
if there is any common module in provideLibs and requireLibs before
write result to output path.
Bug: 298333253
Test: Build failed when the common module is not removed.
Change-Id: I855dfc3484bb6c1fec24d498703c4a2a805913c0
2023-10-05 10:27:43 +09:00
Dan Albert
3440a6697e
Add more information to the ABI error message.
...
Just knowing it failed is pretty useless. Tell people how to update
the ABI dumps.
Bug: http://b/156513478#comment43
Test: m ndk # after breaking the ABI
Change-Id: I7ed6a0acf2d1fbd942410678fc6aba2afbc5a2b6
2023-10-04 23:46:38 +00:00
Spandan Das
62e66592b3
Add packages/modules/Connectivity/staticlibs/netd/libnetdutils
...
This dir contains a dep of FrameworksNetTests
Test: b build
//packages/modules/Connectivity/staticlibs/netd/libnetdutils/...
--config=android
Bug: 297405814
Change-Id: Ia3b0b99b1230bf6cd43dff6c87309b31b70351c0
2023-10-04 23:35:52 +00:00
Vinh Tran
8321763764
Export device arm64 rust flags to Bazel
...
Test: b build //build/bazel/examples/rust:all --config=android
Change-Id: I2656dc963cc4fe0c42da52a0d2a235b5cd86fa13
2023-10-04 18:26:13 -04:00
Elliott Hughes
4b350985eb
riscv64: assume fast unaligned access.
...
We have a CTS test for this, so we may as well let the compiler take
advantage!
Test: treehugger
Change-Id: Icb6dc73be5e6da1155f39ca03245ae6b9d24dfb5
2023-10-04 14:50:03 -07:00
Christopher Parsons
a07eedf390
Merge "create, but dont register, bp2build_deps mutator" into main am: 29c559b785
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768645
Change-Id: I45187628f78551bc3b6638a4563434d6dd28bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:48:17 +00:00
Vinh Tran
c4f7a89c7a
Merge "Export rust flags to bazel" into main am: 4414c4e7ff
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758107
Change-Id: I9ffea540fd7c16c879b8fa0e1f75184be86a475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:47:14 +00:00
Treehugger Robot
4f20dc378d
Merge "Expand regex for likely aidl filegroups" into main am: e88fe1fb92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768335
Change-Id: Iebfd7023a546eacccdad6f7972e3ff5d6b9e6943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 21:46:59 +00:00
Christopher Parsons
29c559b785
Merge "create, but dont register, bp2build_deps mutator" into main
2023-10-04 21:38:49 +00:00
Vinh Tran
4414c4e7ff
Merge "Export rust flags to bazel" into main
2023-10-04 21:22:15 +00:00
Treehugger Robot
e88fe1fb92
Merge "Expand regex for likely aidl filegroups" into main
2023-10-04 21:11:18 +00:00
Kousik Kumar
ca390b2f00
Update symlinks in output directory when TOP dir changes
...
When TOP dir changes and we reuse the same output between the old and new checkouts, we need to rewrite all the symlinks used by Bazel and other tools in the out-directory to point to the new top directory. Otherwise, if the old source dir is deleted, the build will fail.
I used the OUT_DIR/soong/soong.environment.available file to find out the previous PWD.
Tested:
1. Create source dir 1, run build, create source dir 2, remote source dir 1, reuse out dir and rerun build => build succeeded with this change.
2. m libc after moving build TOP. Only the analysis phase was rerun, the actual build was not rerun.
Bug: b/300498226
Change-Id: I196625baa1f4efe7a4734accfa1f0be7c98a7920
2023-10-04 21:07:36 +00:00
Alix
141ab6adde
use message in android.AssertStringMatches()
...
function does not currently use the message argument passed to it.
outputting this as part of the error message would be helpful for any
failures.
Change-Id: I5307df1567e79d85f81edd5a9eb3d4a093041535
2023-10-04 20:19:54 +00:00
Treehugger Robot
c2c6d39f72
Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496
Change-Id: Ic3d9e6756d6ac8cbf7580bac1b6125fea2b4b84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 17:46:21 +00:00
Treehugger Robot
31a5b2c1ef
Merge "Don't create withres-withoutdex files for R8" into main
2023-10-04 17:32:52 +00:00
Treehugger Robot
1f02fc33a2
Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266
Change-Id: I2aacf5397e71d94a56841341524e97d535e6667b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 17:14:42 +00:00
Vinh Tran
50de8becd1
Export rust flags to bazel
...
Bug: 290790800
Test: Inspect out/soong/soong_inspection folder after running `m bp2build`
Change-Id: Iffc43a540f67e5f07d109a0a87f3248fae035267
2023-10-04 13:14:32 -04:00
Treehugger Robot
c68afc4e9f
Merge "Remove unnecessary flag for Kotlin compiles" into main
2023-10-04 17:07:22 +00:00
Colin Cross
57a30b28df
Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main am: ff4d5b40ca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771124
Change-Id: I9728cca90fca6477f7f8a5be3a083a44ab7b539f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 17:00:50 +00:00
Colin Cross
ff4d5b40ca
Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main
2023-10-04 16:36:03 +00:00
Anton Hansson
dc99bafb1d
Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206
Change-Id: I93f042dbda1980e5eb3a8d9e097fa688b7c9cc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 16:13:39 +00:00
Anton Hansson
ddbfdb7f7e
Merge "Support passing lint baseline to doclava" into main
2023-10-04 15:53:49 +00:00
Liz Kammer
1f309f3ac9
Allowlist AndroidFrameworkLintChecker
...
Test: bp2build.sh
Bug: 299463632
Change-Id: I72def76df4f105a3496c7b2dd1588910e62d562b
2023-10-04 10:37:05 -04:00
Liz Kammer
e10fef75f1
Remove unnecessary flag for Kotlin compiles
...
This has been fixed in upstream Kotlin
Test: add /tmp/build.txt file and m metalava
Change-Id: I6d088548ee5a31452ad637bbdd75e26c8863926d
2023-10-04 10:37:05 -04:00
Justin Yun
dead374d4d
Merge "Generate product variants by default" into main am: ce12ea8f95
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829
Change-Id: I31046c62e08a60dbc460f3ac8393782d868d630d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 07:07:47 +00:00
Justin Yun
ce12ea8f95
Merge "Generate product variants by default" into main
2023-10-04 06:29:31 +00:00
Colin Cross
e18bd2097b
Don't pass -lrt or -lgcc_s to darwin rust compiles
...
Fix mac builds by removing the -lrt and -lgcc_s flags from darwin
rust compiles.
Bug: 293349612
Test: builds
Change-Id: I99a9fea963761730efc4d3236135ee6d83dbca57
2023-10-03 21:45:33 -07:00
Treehugger Robot
31f5c0d738
Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005
Change-Id: I80f97088df6104a3e69846ffcf995c24b71bb1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 00:25:38 +00:00
Treehugger Robot
3afb5d8c7b
Merge "Revert "Split Rust crate builds into compile and link phases."" into main am: 2d1bf53169
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768553
Change-Id: I978411fe3639ad3684cb9d5941fd38369a2ac764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 00:24:55 +00:00
Treehugger Robot
4cbd49810c
Merge changes Ib2667798,I9a1fa32b into main
...
* changes:
Symlink to rules_testing in soong integration test.
Remove AconfigJavaHostTest from the allowlist.
2023-10-04 00:22:57 +00:00
Treehugger Robot
2d1bf53169
Merge "Revert "Split Rust crate builds into compile and link phases."" into main
2023-10-04 00:01:08 +00:00
Yu Liu
d61dcef2ff
Symlink to rules_testing in soong integration test.
...
Bug: None
Test: CI
Change-Id: Ib2667798ba4ae330ff46978b37c9c50a5a0cd477
2023-10-03 14:49:50 -07:00
Treehugger Robot
4003606c5f
Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925
Change-Id: I138e00eec2622acd40b8329fe1d04b9c31c9b6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 19:52:57 +00:00
Treehugger Robot
72928074f5
Merge "Don't delete withres-withoutdex jar from R8 rules" into main
2023-10-03 19:17:56 +00:00
Mark Dacek
4ea798d3fd
Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443
Change-Id: If1c67dc37b57f3dd11d7805ec2a55e8ebcdb9769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 19:04:56 +00:00