Commit Graph

74085 Commits

Author SHA1 Message Date
Christopher Parsons
b4d89edb56 Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21 am: 9994462ccb am: 1dd1c7712e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749

Change-Id: I087c8b5f98308e64cdb6c7af612906d6467e3d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:55:05 +00:00
Christopher Parsons
dfbbe6d69e Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea am: 7c738120f9 am: f14e69b82a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747

Change-Id: If80316623fb0bed077e83bcd1e4bcbb2b5af4e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:54:45 +00:00
Christopher Parsons
1dd1c7712e Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21 am: 9994462ccb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749

Change-Id: I35735b5fd49d1b1ac65bff4a71c1070e4e089534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:22:53 +00:00
Christopher Parsons
f14e69b82a Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea am: 7c738120f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747

Change-Id: I0418fbbe976cf8a6a2db71615885cdbdb4d735e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:22:33 +00:00
Christopher Parsons
9994462ccb Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774749

Change-Id: I15bb29036ebefe0093f3fdcc6f5ec7094f48f1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:47:59 +00:00
Christopher Parsons
7c738120f9 Merge "Small readability refactor for bp2buildDepsMutator." into main am: d9cc9ec2ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774747

Change-Id: Ie321473307fb048ece13876ff5987884667a0f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 18:47:40 +00:00
Christopher Parsons
0b5a877f21 Merge changes I5c7f1fc1,I6015581c into main
* changes:
  Fix comment for Bp2buildDepsMutator config.
  Use parameter name hint for BazelLabelModuleDepsWithFn's markAsDeps.
2023-10-05 18:11:28 +00:00
Christopher Parsons
d9cc9ec2ea Merge "Small readability refactor for bp2buildDepsMutator." into main 2023-10-05 18:10:26 +00:00
Trevor Radcliffe
c2d60b8a09 Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260 am: e66b6c5bc3 am: 00c6285a26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439

Change-Id: I3bbc82e2fab6e74f2150625e28ed946fa4e0f3ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:45 +00:00
Elliott Hughes
f905341ce6 Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf am: 6014bf35bc am: 67c1b30ec6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373

Change-Id: I64106c9dbccf5dd26e3f8e55c1d6201c27dabd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 17:11:35 +00:00
Trevor Radcliffe
00c6285a26 Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260 am: e66b6c5bc3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439

Change-Id: I03ea45a9b6f7973ad770e57613a1eafca3a77ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:24:25 +00:00
Elliott Hughes
67c1b30ec6 Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf am: 6014bf35bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373

Change-Id: Ic33b6510e252af1313738843df619d7d42cdfa3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:24:05 +00:00
Trevor Radcliffe
e66b6c5bc3 Merge "Implement bp2build for Sysprop Java" into main am: e3e930d260
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769439

Change-Id: I9d5ca5c4c0ec40b0e56183d517af326420b3224e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 16:09:18 +00:00
Trevor Radcliffe
e3e930d260 Merge "Implement bp2build for Sysprop Java" into main 2023-10-05 15:59:53 +00:00
Jingwen Chen
9e7f91a0ab Merge "Delete some api_bp2build dead code." into main am: 26d852a320 am: a2a847ff0f am: 07438fd01b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

Change-Id: I08a1bebce4a5539c087a56b64e73494792ab267b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:52:16 +00:00
Alix Espino
2503eb1321 Merge "use message in android.AssertStringMatches()" into main am: b7a6720611 am: 5511afdcaa am: 00b7ab6ad0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304

Change-Id: Idd810158809866869f9b5e13f488efb3855e8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:52:03 +00:00
Elliott Hughes
6014bf35bc Merge "riscv64: assume fast unaligned access." into main am: 3fb5c15adf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734373

Change-Id: I05345473ece976678692608c5cac4b22412e5424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:51:58 +00:00
Kousik Kumar
6112e75cb2 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962 am: 422bad6f88 am: 169678e288
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I1818842c30eb80bc8a8d721334a0cf43452698e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:51:35 +00:00
Jingwen Chen
07438fd01b Merge "Delete some api_bp2build dead code." into main am: 26d852a320 am: a2a847ff0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

Change-Id: I39b40b3bf0f9afd81c4bd8e0285dd593835916c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:05:57 +00:00
Elliott Hughes
3fb5c15adf Merge "riscv64: assume fast unaligned access." into main 2023-10-05 15:03:02 +00:00
Jingwen Chen
a2a847ff0f Merge "Delete some api_bp2build dead code." into main am: 26d852a320
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774750

Change-Id: I8bf4e7a1f85f3396e7ea0daa33261f02bebf742f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:51:07 +00:00
Alix Espino
00b7ab6ad0 Merge "use message in android.AssertStringMatches()" into main am: b7a6720611 am: 5511afdcaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304

Change-Id: I76a3e39ebbb26dc8fe8538ab79bfed6ad0cebeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:58 +00:00
Kousik Kumar
169678e288 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962 am: 422bad6f88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I28f8edc713d172af2094a214f3db06467ee0e7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:15 +00:00
Jingwen Chen
26d852a320 Merge "Delete some api_bp2build dead code." into main 2023-10-05 14:39:33 +00:00
Alix Espino
5511afdcaa Merge "use message in android.AssertStringMatches()" into main am: b7a6720611
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773304

Change-Id: I2536c55cdebb288526c1153ab97e46a47e676dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:19:29 +00:00
Kousik Kumar
422bad6f88 Merge "Update symlinks in output directory when TOP dir changes" into main am: a902250962
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757787

Change-Id: I03f17df8a34f58a93d96141fbab5b521b2ff303b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:19:08 +00:00
Alix Espino
b7a6720611 Merge "use message in android.AssertStringMatches()" into main 2023-10-05 13:56:02 +00:00
Kousik Kumar
a902250962 Merge "Update symlinks in output directory when TOP dir changes" into main 2023-10-05 13:29:20 +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
Kiyoung Kim
75e9b19848 Merge "Do not allow a module exists both in provideLibs and requireLibs" into main am: f2fd12d97c am: 25ee09b5b6 am: 9b31abbd26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762828

Change-Id: Ie74e276644dd93a36b9bb898f5a21bd27b3f30e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 05:29:21 +00:00
Kiyoung Kim
9b31abbd26 Merge "Do not allow a module exists both in provideLibs and requireLibs" into main am: f2fd12d97c am: 25ee09b5b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762828

Change-Id: I61b4711eb26a6819014b47815ede5ab198b3c5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 04:59:41 +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
0666982307 Merge "Add more information to the ABI error message." into main am: 98b3cb2787 am: dc02013beb am: cc7b24f36b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773847

Change-Id: I5fa46ab3751d27f1ce595f3aa4c68387c71e7356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:39:15 +00:00
Treehugger Robot
2c8ce9b808 Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main am: 65a06d460f am: ad5c8c1460 am: 30de5c190d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773845

Change-Id: I9914e70e29ddfd46e57c67b794eab697487e4f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:39:05 +00:00
Spandan Das
09e3710a2d Merge "Create bp2build converter for versioned_ndk_headers" into main am: ee557e4c69 am: 93cc736f1e am: f213c6dafc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769119

Change-Id: Ibe0b70a5b3d1fcc7f7dd55dc8d6944c3b2f30f4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:38:49 +00:00
Treehugger Robot
cc7b24f36b Merge "Add more information to the ABI error message." into main am: 98b3cb2787 am: dc02013beb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773847

Change-Id: Id8dbacce270a65c07abbb08adb7c6387018f5527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:06:51 +00:00
Treehugger Robot
30de5c190d Merge "Add packages/modules/Connectivity/staticlibs/netd/libnetdutils" into main am: 65a06d460f am: ad5c8c1460
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773845

Change-Id: If88154713032b3aa19fd1f2c56a28a5363e65655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:06:41 +00:00
Spandan Das
f213c6dafc Merge "Create bp2build converter for versioned_ndk_headers" into main am: ee557e4c69 am: 93cc736f1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769119

Change-Id: Ibdb0e99ce4f7631e0955da13af40f4fe0c43d360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 03:06:28 +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