StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,852 Commits 1 Branch 0 Tags
67a98d3520c1519c6de0e8ef897078f11f56a752
Commit Graph

66852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
b880908c09 Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main am: f5ee8e3ffc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674197

Change-Id: I55410f9ae8b81428ddcc8edece741e941adf5807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 19:54:31 +00:00
Cole Faust
ed940008ac Bp2build product variables on non-arch-variant module types 
Mostly so that genrules can have their command qualified on a product
variable.

Bug: 295910468
Test: m nothing
Change-Id: I28cc18a1b3b00368f4768a1326259a656ce970ec
 2023-08-15 11:59:24 -07:00
Trevor Radcliffe
d3243d5e74 Use relative path instead of base for python proto 
We encountered a duplicate sources bug in python proto generation
because we're only using the base name. This CL makes it use the
entire path to avoid this.

Fixes: 295333879
Test: Presubmits
Change-Id: I4ab821508cd5979bd595e327c1ccd3d68110fba6
 2023-08-15 18:33:00 +00:00
Treehugger Robot
f5ee8e3ffc Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main 2023-08-15 18:31:21 +00:00
Yu Liu
0cc2fbc53f Merge "Denylist jemalloc5_stresstests since it is run by a special script." into main am: 3625faffc7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2703056

Change-Id: I0041d675b499cc14b72079da1acac08647c9424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 17:06:30 +00:00
Yu Liu
3625faffc7 Merge "Denylist jemalloc5_stresstests since it is run by a special script." into main 2023-08-15 16:34:26 +00:00
Liz Kammer
2c8b9f8ba0 Merge changes from topic "bazel_module_labels" into main am: d365cc4d86 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706133

Change-Id: I89052d6948ccd338bc60ea21abfe9092f09d3861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 14:30:40 +00:00
Vinh Tran
f84b9a3ba7 Merge "Remove dylibs prop from rust module types" into main am: e6adc83c6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706816

Change-Id: I4cb02aafc628cd616a0318d2b1063dc8cc066b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 14:30:19 +00:00
Liz Kammer
d365cc4d86 Merge changes from topic "bazel_module_labels" into main 
* changes:
  Set Bazel_module for (un)converted sysprop libs
  Make ShouldConvertWithBp2build avail in loadhooks
 2023-08-15 14:11:25 +00:00
Vinh Tran
e6adc83c6c Merge "Remove dylibs prop from rust module types" into main 2023-08-15 13:45:10 +00:00
A. Cody Schuffelen
c183e3a473 Rust library linking fixes 
- Hide universal binary dependency for rust

Without a darwin_arm64 libstd prebuilt, many rust binaries are not
possible to build as a universal binary anyway. This fixes an
intermediate error with compiling rust FFI targets, where C++ shared
library dependencies for both architectures were combined into the same
linker command.

There is still an outstanding problem with C++ executable targets that
include rust FFI library targets, as the rust FFI library targets
fail to find a proper libstd to build the arm64 side of the universal
executable.

- Use dynamic_lib instead of soname

This matches similar logic in cc/library.go : linkerFlags for including
shared libraries.

Bug: 291830024
Test: m libkmr_cf_ffi (when enabled for darwin)
Change-Id: I1d6b6a7855c6649b93ab6592ea43b17c6e37b3a3
 2023-08-14 21:27:41 -07:00
Yabin Cui
97ee01380a Merge "Disable Global ThinLTO by default" into main am: 78e4695b3a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2708613

Change-Id: Iaceb074371f962fc5ab5881730a7d234afffd80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 04:03:48 +00:00
Yabin Cui
78e4695b3a Merge "Disable Global ThinLTO by default" into main 2023-08-15 03:27:21 +00:00
Wei Li
035726c168 Merge "Add new diffs found in vendor partition in sbom_test." into main am: 66ae90d3ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2705829

Change-Id: I77e7c7ad26ee28989bed2d649c5b45666976a0d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 23:58:26 +00:00
Wei Li
66ae90d3ce Merge "Add new diffs found in vendor partition in sbom_test." into main 2023-08-14 23:20:47 +00:00
Yabin Cui
9c81c0cfd9 Disable Global ThinLTO by default 
Because enabling ThinLTO makes some constructor functions not called
in arm64 executables.

Bug: 295944813
Test: build
Change-Id: Ic0cab5fd80aa86d0d9ca1131564b747a445c6e46
 2023-08-14 15:47:36 -07:00
Jihoon Kang
e7ee256746 Stop sdk_library generated api_library to depend on full surface api_library 
Since full_api_surface_libs extract class files instead of srcjar file,
full_api_surface_stub can be replace with android_*_stubs_current,
instead of the api_library android_*_stubs_current.from-text.
Functionally, the class files of the two modules are identical (in
from-text stub build), but depending on the from-text java_api_library
leads to missing dependency errors in partial branches (especially ART
branches). To resolve this problem, make sdk_library generated
api_library depend on the missing dependency handled
android_*_stubs_current.

Since android_module_lib_stubs_current.from-text does not have its
from-source equivalent, this can remain as dependency as the module is
moved to build/soong in aosp/2674196

Test: m (default to from-text stub build)
Bug: 274805756
Change-Id: Ic8bbd25252e5f9f1dc7c059ce6b00a951188985d
 2023-08-14 21:18:13 +00:00
Cole Faust
452df32de4 Merge "Bp2build genrule commands as configurable properties" into main am: 9db358d43d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2707654

Change-Id: I0f15f1753efd54864a839308c7d45d344cf11b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 21:08:23 +00:00
Jihoon Kang
7bdc85175f Merge "Add previous_api property to java_api_library module" into main am: 9a3cd19bee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2685826

Change-Id: If5c6acc913f0c9ee9923a47a9e6fb23b02dbfd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 21:07:47 +00:00
Spandan Das
1c42b34e1c Merge "Fix possible orphaned proto_library targets" into main am: 6a299f7d34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2707793

Change-Id: I7548237e9b3055b97c397a2fbc48b593b4c889ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 21:05:16 +00:00
Cole Faust
9db358d43d Merge "Bp2build genrule commands as configurable properties" into main 2023-08-14 21:01:48 +00:00
Jihoon Kang
9a3cd19bee Merge "Add previous_api property to java_api_library module" into main 2023-08-14 20:50:32 +00:00
Wei Li
9ff64e6aff Add new diffs found in vendor partition in sbom_test. 
Bug: 295606843
Test: build/soong/tests/sbom_test.sh
Change-Id: I50af9df5ea91ca113c272139530b0c468d41f5c8
 2023-08-14 13:31:44 -07:00
Spandan Das
6a299f7d34 Merge "Fix possible orphaned proto_library targets" into main 2023-08-14 20:24:03 +00:00
Vinh Tran
d2c152ed78 Merge "Add unit test to verify default linkage for rust binaries" into main am: 5ce68092d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2707575

Change-Id: I00891cfb67d6d655688f3edbf0b5a51dd292784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 19:41:37 +00:00