StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,111 Commits 1 Branch 0 Tags
ed541ef3d14c8377014df5d76c2c079a7743f4a6
Commit Graph

72111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Jobredeaux
ed541ef3d1 Merge "Support asset_dirs property in bp2build for android_{app,library}" into main am: 491fa2fe50 am: 67a98d3520 am: 6a5370155c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2715093

Change-Id: Iacc24d39b8d015c1f2a16ecfdcbf8b8271173f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 19:13:38 +00:00
Romain Jobredeaux
6a5370155c Merge "Support asset_dirs property in bp2build for android_{app,library}" into main am: 491fa2fe50 am: 67a98d3520 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2715093

Change-Id: If857d6292742fc18bc7600d616aa8f13147def34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 18:32:31 +00:00
Romain Jobredeaux
67a98d3520 Merge "Support asset_dirs property in bp2build for android_{app,library}" into main am: 491fa2fe50 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2715093

Change-Id: If593d647239f1c015e9cc9047737dff34cf72715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 18:03:12 +00:00
Romain Jobredeaux
491fa2fe50 Merge "Support asset_dirs property in bp2build for android_{app,library}" into main 2023-08-17 17:43:18 +00:00
Vinh Tran
6ba3996f5c Merge "Add test mode support for rust_aconfig_library" into main am: a207d486e1 am: d6c3a399dc am: decffb2813 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706453

Change-Id: Ifdf6a0d9e8a45c02f1cd4de4da2a85d6980af548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 16:20:32 +00:00
Vinh Tran
decffb2813 Merge "Add test mode support for rust_aconfig_library" into main am: a207d486e1 am: d6c3a399dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706453

Change-Id: I1914382ea9238132e739c8a40e1623a226556deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:54:08 +00:00
Trevor Radcliffe
9988c9020c Merge "Use relative path instead of base for python proto" into main am: b46c210155 am: 9950e78ffb am: d4ac9f2065 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2710073

Change-Id: Id22aeabe3a34a28c24570583c07fd9be487019be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:27:10 +00:00
Vinh Tran
d6c3a399dc Merge "Add test mode support for rust_aconfig_library" into main am: a207d486e1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706453

Change-Id: I80c7d981f8d453a280598e7faee06180bd46a9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:27:01 +00:00
Vinh Tran
a207d486e1 Merge "Add test mode support for rust_aconfig_library" into main 2023-08-17 14:48:37 +00:00
Trevor Radcliffe
d4ac9f2065 Merge "Use relative path instead of base for python proto" into main am: b46c210155 am: 9950e78ffb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2710073

Change-Id: Ic81dcb0adf3df49b69f2887e555e8cf9185be3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 14:36:17 +00:00
Romain Jobredeaux
7a71e07040 Support asset_dirs property in bp2build for android_{app,library} 
Bug: 276928228
Test: Unit Tests
Change-Id: I6a2899de21e046e54cd0cd71314bf7aec4a470f6
 2023-08-17 10:18:55 -04:00
Trevor Radcliffe
9950e78ffb Merge "Use relative path instead of base for python proto" into main am: b46c210155 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2710073

Change-Id: I037f4b01e8dcf1a8eb4fda016c106e7a478ac448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:43:23 +00:00
Trevor Radcliffe
b46c210155 Merge "Use relative path instead of base for python proto" into main 2023-08-17 13:01:17 +00:00
Jihoon Kang
3e77a0ea26 Merge "Revert "Move from-text stub java_api_library modules closer to s..."" into main am: 06a0b51777 am: a9434b2d88 am: 6f2ab12b9b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2713675

Change-Id: I314bbbbac3101e9d5fae3570d5f5aee8d617e660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 03:06:06 +00:00
Treehugger Robot
f92ca6dfbf Merge "Move from-text stub java_api_library modules closer to source" into main am: f24480b51c am: f978d68c28 am: 0ecea67111 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674196

Change-Id: I10333161d154d9c8d8544c473091137df106c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 03:04:17 +00:00
Treehugger Robot
ca70d0d934 Merge "Use Label (string) instead of Label (struct) to dedupe" into main am: 4315796730 am: c9d58c8bbc am: 2a2d2dea8b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712536

Change-Id: I898e76b942001b64aa7a2887ffb7827b4886be17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 03:03:31 +00:00
Jihoon Kang
6f2ab12b9b Merge "Revert "Move from-text stub java_api_library modules closer to s..."" into main am: 06a0b51777 am: a9434b2d88 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2713675

Change-Id: If1a5acda14e3e49968a293ad4014fc5d5f78767e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:24:23 +00:00
Treehugger Robot
0ecea67111 Merge "Move from-text stub java_api_library modules closer to source" into main am: f24480b51c am: f978d68c28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674196

Change-Id: I276d3a6e385fcecf14631ac6ca562f97da9a168a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:22:52 +00:00
Treehugger Robot
2a2d2dea8b Merge "Use Label (string) instead of Label (struct) to dedupe" into main am: 4315796730 am: c9d58c8bbc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712536

Change-Id: Ie7b9c6e9fa5de7b8da3a78a178f6a6585b5050da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:21:56 +00:00
Jihoon Kang
a9434b2d88 Merge "Revert "Move from-text stub java_api_library modules closer to s..."" into main am: 06a0b51777 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2713675

Change-Id: Ied3d858ddb15da352207ca2d295b21a49da84069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:40:54 +00:00
Treehugger Robot
f978d68c28 Merge "Move from-text stub java_api_library modules closer to source" into main am: f24480b51c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674196

Change-Id: I9b4b5db5ab32e23dc8a02da4a303baf60535d540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:38:15 +00:00
Jihoon Kang
06a0b51777 Merge "Revert "Move from-text stub java_api_library modules closer to s..."" into main 2023-08-17 01:36:33 +00:00
Jihoon Kang
4434b7132c Revert "Move from-text stub java_api_library modules closer to s..." 
Revert submission 2655262-move_java_api_libraries

Reason for revert: Breaking build

Reverted changes: /q/submissionid:2655262-move_java_api_libraries

Change-Id: I2719de4d35e5a4131468d7e84b369631ec86eb2b
 2023-08-17 01:26:23 +00:00
Treehugger Robot
f24480b51c Merge "Move from-text stub java_api_library modules closer to source" into main 2023-08-17 01:13:28 +00:00
Treehugger Robot
c9d58c8bbc Merge "Use Label (string) instead of Label (struct) to dedupe" into main am: 4315796730 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712536

Change-Id: Ie66e69498a728a7c889607ec552928f90b361e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:12:20 +00:00
Treehugger Robot
4315796730 Merge "Use Label (string) instead of Label (struct) to dedupe" into main 2023-08-17 00:17:54 +00:00
Spandan Das
514372796c Merge "Allowlist external/gflags in bp2build" into main am: 2bfc31eb23 am: 23f2951b60 am: e225785265 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712453

Change-Id: I31ec43635c9b98401607e9a49e422cdae19a7496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:56:20 +00:00
Jihoon Kang
b6ec2c8ea0 Move from-text stub java_api_library modules closer to source 
This change moves java_api_library modules that were previously defined
in build/orchestrator closer to where their from-source equivalents are
defined.

Test: m (default to from-text stub build)
Bug: 274805756
Merged-In: If66b5bba719bb389a69f2353d2218a89b2b96b90
Change-Id: If66b5bba719bb389a69f2353d2218a89b2b96b90
 2023-08-16 22:12:11 +00:00
Spandan Das
e225785265 Merge "Allowlist external/gflags in bp2build" into main am: 2bfc31eb23 am: 23f2951b60 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712453

Change-Id: I122a6fc34e39644487a5b43df1329eef94442300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:11:16 +00:00
Cody Schuffelen
b147561617 Merge "Rust library linking fixes" into main am: d89ee08bbf am: ef90ad380e am: 558c3ed409 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708456

Change-Id: Id853cf57ce0021334520326a954819871df0085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:52:13 +00:00
Spandan Das
5e04d4884a Use Label (string) instead of Label (struct) to dedupe 
Using Label struct as the map key causes issues because it contains
OriginalModuleName. The same module will have a different value for this
property when called from inside a soong namespace vs from outside.

If there are dups, we can just choose the first one. OriginalModuleName
is often used with ModuleFromName, and that function panics if there are
modules with the same name in two separate soong namespaces

Test: go test ./bp2build ./bazel

Change-Id: I2ee33efab03016a72f1eea99cb958b6198baeca2
 2023-08-16 21:30:02 +00:00
Spandan Das
23f2951b60 Merge "Allowlist external/gflags in bp2build" into main am: 2bfc31eb23 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2712453

Change-Id: Ic38e5fcd3cc3ff97b1642cda3051769c71404f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:27:24 +00:00
Cody Schuffelen
558c3ed409 Merge "Rust library linking fixes" into main am: d89ee08bbf am: ef90ad380e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708456

Change-Id: I9b46839ce3709fb2bd510d7ebd6457eef6466af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:03:59 +00:00
Spandan Das
2bfc31eb23 Merge "Allowlist external/gflags in bp2build" into main 2023-08-16 20:54:51 +00:00
Cody Schuffelen
ef90ad380e Merge "Rust library linking fixes" into main am: d89ee08bbf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708456

Change-Id: I9420923750fc669d4b41349f3e7491bdbf5974ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 20:20:20 +00:00
Cody Schuffelen
d89ee08bbf Merge "Rust library linking fixes" into main 2023-08-16 19:51:02 +00:00
Spandan Das
2a8f9009c2 Allowlist external/gflags in bp2build 
This is a transitive dep of some tests in internal

Change-Id: Ie716309ee8430b84600876e18b7bed02736672bb
Test: TH
 2023-08-16 17:51:14 +00:00
Ivan Lozano
7820ef12ab Merge "rust: Add support for host fuzzers." into main am: b0e1035417 am: 7c0f3aaa2f am: 5ca0f22bd9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700333

Change-Id: Ic97bc2551a1c67f9a7045fd66b455ac4bb78c7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 16:55:07 +00:00
Ivan Lozano
5ca0f22bd9 Merge "rust: Add support for host fuzzers." into main am: b0e1035417 am: 7c0f3aaa2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700333

Change-Id: I4916ea88ac0c7331dfeba34f9f36311a103ac75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 16:11:11 +00:00
Ivan Lozano
7c0f3aaa2f Merge "rust: Add support for host fuzzers." into main am: b0e1035417 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700333

Change-Id: I8d5af5d8235187e866388e13d966e20af53993e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 15:02:23 +00:00
Ivan Lozano
b0e1035417 Merge "rust: Add support for host fuzzers." into main 2023-08-16 14:07:19 +00:00
Paul Duffin
1987d4da6c Merge "Revert "Re-enable checks that pass in udc-dev-plus-aosp and downstream"" into udc-dev-plus-aosp am: 33008518e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24441311

Change-Id: I26298373efe7a06694867de7329a2278b1c4715c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 12:02:46 +00:00
Paul Duffin
33008518e1 Merge "Revert "Re-enable checks that pass in udc-dev-plus-aosp and downstream"" into udc-dev-plus-aosp 2023-08-16 11:11:55 +00:00
Paul Duffin
58c2388f92 Revert "Re-enable checks that pass in udc-dev-plus-aosp and downstream" 
This reverts commit bdc0578df1.

Reason for revert: b/296088866

Change-Id: I053314736758f48ea99920a141443c1489d2477b
 2023-08-16 08:04:26 +00:00
Treehugger Robot
3cf64d7ffc Merge "Bp2build product variables on non-arch-variant module types" into main am: f768e6e27e am: ed5e34b77d am: 9299a3c54f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708885

Change-Id: Ibead9ef74ee4107a807d6e5cc6279f7fe8229d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 00:22:59 +00:00
Treehugger Robot
9299a3c54f Merge "Bp2build product variables on non-arch-variant module types" into main am: f768e6e27e am: ed5e34b77d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708885

Change-Id: Ieab765a1a982055accf9e7e84e06047d4e721803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 23:39:11 +00:00
Treehugger Robot
ed5e34b77d Merge "Bp2build product variables on non-arch-variant module types" into main am: f768e6e27e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708885

Change-Id: I0c9a7aacf883ea35afbd920628a3a04092732e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 22:55:07 +00:00
Treehugger Robot
f768e6e27e Merge "Bp2build product variables on non-arch-variant module types" into main 2023-08-15 21:51:31 +00:00
Treehugger Robot
0454473c23 Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main am: f5ee8e3ffc am: b880908c09 am: 740c5a4011 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674197

Change-Id: I75ed9a26f2cc075608b84d4a929bcf267ac2a670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 21:25:24 +00:00
Treehugger Robot
740c5a4011 Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main am: f5ee8e3ffc am: b880908c09 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674197

Change-Id: I2c6de2f158b111dd103c50584cb88d5cd9cb8eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 20:38:35 +00:00