StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,033 Commits 1 Branch 0 Tags
82c3fafd8fa4a93b9dbe0e48a95d9be3fcbdadb7
Commit Graph

67033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
82c3fafd8f Merge "Add aconfig annotations for java_aconfig_library" into main am: 01f70e8d0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2682307

Change-Id: I1438c67f334f38cc17c75ea9cc08cddab5496171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 13:41:38 +00:00
Treehugger Robot
01f70e8d0e Merge "Add aconfig annotations for java_aconfig_library" into main 2023-08-28 13:03:56 +00:00
Ian Zerny
2d8d538c2b Merge "Translate SDK level 10000 to a valid compiler min-api" into main am: f94c8113a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727794

Change-Id: I62732250881d9bb8f1922c7afe8b93cab70559e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 07:23:06 +00:00
Ian Zerny
f94c8113a3 Merge "Translate SDK level 10000 to a valid compiler min-api" into main 2023-08-28 06:26:36 +00:00
Joe Onorato
8f75585b37 Add aconfig annotations for java_aconfig_library 
Test: m
Bug: 289087078
Change-Id: I860b91f984b2f2c596360490337fb25a4df7a988
 2023-08-26 08:26:18 -07:00
Vinh Tran
6c28803c66 Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main am: 54a5905803 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726675

Change-Id: Ib0f42a43a92e2b490c5a8d3ed46210d55235b0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 03:34:58 +00:00
Vinh Tran
54a5905803 Merge changes from topics "build-aconfig", "build-libprotobuf-for-host-only" into main 
* changes:
  Allowlist aconfig
  Implement bp2build converter for rust_protobuf_host
  Implement bp2build converter for rust_binary
  Convert libprotobuf to Bazel
  Allowlist all aconfig deps modulo libprotobuf and libaconfig_protos
  Implement bp2build converter for rust_proc_macro
  Allowlist rust_library dependencies of aconfig
  Implement bp2build converter for rust_library
 2023-08-26 03:17:59 +00:00
Vinh Tran
85b177dff7 Allowlist aconfig 
Test: b build //build/make/tools/aconfig:aconfig
Bug: 295910295
Change-Id: Ic71b2982a715b9ea36f8bf40fc5158e6f58f6a2c
 2023-08-25 18:03:43 -04:00
Vinh Tran
0c4b9ec5e0 Implement bp2build converter for rust_protobuf_host 
Test: go test
Bug: 295925256
Change-Id: I43b7359da8fc19f4338e2583448b7617194df5e6
 2023-08-25 18:00:33 -04:00
Vinh Tran
093a57edb2 Implement bp2build converter for rust_binary 
Test: go test
Bug: 295910295
Change-Id: Ieb18d9071f28e53a0463614594cee0fd755b7b3c
 2023-08-25 17:58:53 -04:00
Vinh Tran
9b84678faf Convert libprotobuf to Bazel 
Since this is a one-off just for building libprotobuf that will be removed when we handle cargo output more generically (b/297364081), I didn't write a unit test for this CL.

Test: b build //external/rust/crates/protobuf:libprotobuf
Bug: 295925256
Change-Id: I00cf44d54be27a09c184a96c13b250a2e54e2d10
 2023-08-25 17:53:37 -04:00
Vinh Tran
c1a6ceefd3 Allowlist all aconfig deps modulo libprotobuf and libaconfig_protos 
Test: b build //external/rust/crates:all
Bug: 295903972
Change-Id: Ieb29516722155ef8921e454eaa1ea51fad99ec08
 2023-08-25 17:51:54 -04:00
Vinh Tran
b4bb20f583 Implement bp2build converter for rust_proc_macro 
Test: WIP
Bug: 297356482
Change-Id: I17d1a0a95d4a67ccbc9b2d74e49bcacd6ff4d26b
 2023-08-25 17:50:48 -04:00
Vinh Tran
3570ce3f69 Allowlist rust_library dependencies of aconfig 
These deps are not depdendent on libaconfig_protos (rust_protobuf_host) and rust_proc_macro modules.

Test: b build //external/rust/crates/...
Bug: 295910506
Change-Id: I1c6058d029c2d475bd760ae9497fe78343a13882
 2023-08-25 17:45:24 -04:00
Vinh Tran
bcb5f57eed Implement bp2build converter for rust_library 
Test: go test
Bug: 297294749
Change-Id: I5400fe2c0fe2097b7a5810c736fbd1de4f35c6f7
 2023-08-25 17:42:13 -04:00
Makoto Onuki
c10a2c20dd Support java_data in sh_test_host am: 1725b20d14 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726813

Change-Id: I4251e3577dd2985f62827ec5bcaf5fe7d86ea001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:23:16 +00:00
Ian Zerny
c26029b473 Translate SDK level 10000 to a valid compiler min-api 
Targets with the special level 10000 are compiled using the current
platform SDK level. They are also compiled as a "platform build" which
will disable features such as API modeling and method backports.

Bug: 295591477
Test: manual inspection of the updated build commands
Change-Id: Ifda8859396b33dde4c46a9b212ddb855b012bf07
 2023-08-25 13:48:21 +02:00
Makoto Onuki
1725b20d14 Support java_data in sh_test_host 
Bug: 297225342
Test: with a custom test rule
Test: cd sh && go test ./...
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de5d265a798ce0e12ad0a2d0a6675942df5cd10b)
Merged-In: Ia5a60fa6d917f2c2fde56df543625024ec11877a
Change-Id: Ia5a60fa6d917f2c2fde56df543625024ec11877a
 2023-08-24 22:17:56 +00:00
Treehugger Robot
4e3ee2c9a5 Merge "Add the system image test to the bazel sandwich" into main am: 4e6c42d417 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724199

Change-Id: Ib462d61af54b11a64bb9b5220b97dac7ce0e094b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 22:07:15 +00:00
Treehugger Robot
4e6c42d417 Merge "Add the system image test to the bazel sandwich" into main 2023-08-24 21:50:22 +00:00
Spandan Das
ccce31bb74 Merge changes from topic "proto-include-dir-py" into main am: 234bb3bd8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721824

Change-Id: Iec171d46c05ba9c5a2fdc47e8a63f58940a90879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 21:27:12 +00:00
Spandan Das
234bb3bd8d Merge changes from topic "proto-include-dir-py" into main 
* changes:
  Handle proto.include_dirs in bp2build for py
  Add proto.local_include_dirs support in bp2build
  Add manual tag to proto_library at the root package
 2023-08-24 20:57:47 +00:00
Spandan Das
4ed3d120c9 Handle proto.include_dirs in bp2build for py 
Followup to aosp/2711114 which added proto.include_dirs support for cc

Test: go test ./bp2build
Test: Added an integration test in build/bazel/examples
Bug: 285140726
Change-Id: Ic78dacbe46d9ea67e9441948852a3f94dabbb35e
 2023-08-24 19:21:10 +00:00
Spandan Das
4e5a194b90 Add proto.local_include_dirs support in bp2build 
This is a followup to aosp/2711093 which added support for
proto.include_dirs. local_include_dirs is simlar, except that is
relative to the module directory.

Test: go test ./bp2build
Bug: 285140726
Change-Id: I32ddc7371048672d6935f827c8aee9d767305e2c
 2023-08-24 19:00:12 +00:00
Spandan Das
e0f2ed56a0 Add manual tag to proto_library at the root package 
This is a fix similar to aosp/2707793. This adds manual tags to the
top-level proto_library created in the root package, plus any
dynamically created proto_library targets for proto.include_dirs. These
proto_library targets might not specify their deps correctly and might
be unbuildable.

(We need to keep these targets because they provide a ProtoInfo for
cc/java/py source gen)

Test: go test ./bp2build
Change-Id: Ic00f05186327fcfcc8d33a0a2c0891ed619b7acb
 2023-08-24 19:00:11 +00:00
Colin Cross
14e366fbec Merge "Fix adding manual ubsan runtime to static glibc binaries" into main am: 55e775f94f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723481

Change-Id: I86d3347d88745832cce9f5fa83beba53aea7fdd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 18:03:24 +00:00
Colin Cross
55e775f94f Merge "Fix adding manual ubsan runtime to static glibc binaries" into main 2023-08-24 17:11:47 +00:00
Cole Faust
39b614af17 Add the system image test to the bazel sandwich 
Also make -test.sh files executable, while we wait for a bazel update
that will tell us which FileWrite actions should be executable.

Bug: 297268692
Test: m bazel_sandwich
Change-Id: I60498577ba12813bff8bbdbc1b997ea4addefd17
 2023-08-24 09:47:35 -07:00
Jason Wu
acb158233c Merge "bp2build converter for sh_test followup" into main am: 66de6c445f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700335

Change-Id: Id60ac362bee705a8078130d18381696d7edd782e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 16:05:41 +00:00
Jason Wu
66de6c445f Merge "bp2build converter for sh_test followup" into main 2023-08-24 15:19:28 +00:00
James Farrell
4979ed83d1 Merge "Temporarily disable python precompilation for py3.11" into main am: c36312a64d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722593

Change-Id: I8223e261e5ad8ac9727ad8a7fd0a2f01da1ae8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 14:47:10 +00:00
James Farrell
c36312a64d Merge "Temporarily disable python precompilation for py3.11" into main 2023-08-24 14:13:10 +00:00
Vinh Tran
4bb0237336 Export RustDefaultVersion to Bazel am: 80f6b2147f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724373

Change-Id: If989d9cdcbc277e70e6dd694aa26f4716fc581fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 13:29:25 +00:00
Colin Cross
0df8153267 Fix adding manual ubsan runtime to static glibc binaries 
Sanitized glibc binaries get their runtime added by clang, not by
Soong, but unsanitized glibc binaries with sanitized dependencies
need their runtime added manually by Soong.  Fix adding a static
runtime dependency to static glibc binaries.

Fixes: 297250415
Test: TestUbsan
Change-Id: I4913326604f9efebd8ecd4aad2f109fad8b6a80c
 2023-08-23 22:39:58 -07:00
Treehugger Robot
f035930cfc Merge "Denylist "ota_from_raw_img" module for bp2build" into main am: 55d7f75b76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724873

Change-Id: I0812f38dcf449dc519d37cbceb5e65bcc90ade16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:05:12 +00:00
Motomu Utsumi
491418ff5e Merge "Add package/modules/Connectivity bpf_headers path" into main am: 5147d927e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720154

Change-Id: I9f621b5d02beb538f2a08a473ee105c9e96eeed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:04:56 +00:00
Vinh Tran
80f6b2147f Export RustDefaultVersion to Bazel 
The config constant is consumed by rust toolchain implemented in aosp/2709668.

Bug: 295918553
Test: go test
Change-Id: I0a28a802ad28f6ee24dfb1b5bdab72094534ae04
 2023-08-23 22:55:40 -04:00
Treehugger Robot
55d7f75b76 Merge "Denylist "ota_from_raw_img" module for bp2build" into main 2023-08-24 02:17:55 +00:00
Motomu Utsumi
5147d927e0 Merge "Add package/modules/Connectivity bpf_headers path" into main 2023-08-24 02:12:51 +00:00
Colin Cross
2c56414bf5 Merge "Strip zip64 extras after writing local header when copying" into main am: a2dd54de02 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723476

Change-Id: I6ade4952ec14c4c6f8cbb6b5e076c3a781b1d5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 01:06:06 +00:00
Colin Cross
a2dd54de02 Merge "Strip zip64 extras after writing local header when copying" into main 2023-08-24 00:28:53 +00:00
Jooyung Han
ab1bd8edb8 Merge changes from topic "deprecate-zip-apex" into main am: 138ee09e28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722933

Change-Id: Id30a7dfd8f0f649e6c2a0736cf8ad912819617f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 00:28:12 +00:00
Jooyung Han
138ee09e28 Merge changes from topic "deprecate-zip-apex" into main 
* changes:
  apex: Remove host support
  apex: Remove apexPackagingMutator
  apex: Remove 'zip' apex support
 2023-08-23 23:48:43 +00:00
Jihoon Kang
04b7d808fe Denylist "ota_from_raw_img" module for bp2build 
The module introduced in aosp/2722136 depends on `delta_generator`,
which is a module defined in directory that is not bp2build default
allowed, causing bp2build failure. Therefore, denylist the module to
resolve breakage.

Test: TH & abtd
Change-Id: I313239d82d384ec7de8167aa385806ebde02d2c8
Bug: 297269308
 2023-08-23 23:16:16 +00:00
Romain Jobredeaux
f9e64d40eb Merge "Allowlist prebuilt/r8 for bp2build." into main am: 573eabaa62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724033

Change-Id: I31a48270234be2b0270f6b7768be63fa3d56e926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 21:12:36 +00:00
Romain Jobredeaux
573eabaa62 Merge "Allowlist prebuilt/r8 for bp2build." into main 2023-08-23 20:43:47 +00:00
Yu Liu
e247a40af7 Merge "Support dynamic config file for cc_test." into main am: 6c50f3ef06 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719717

Change-Id: I8ec141605ac72321688e297ad3f1ccd05bc617c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 17:22:28 +00:00
Yu Liu
6c50f3ef06 Merge "Support dynamic config file for cc_test." into main 2023-08-23 17:11:04 +00:00
Romain Jobredeaux
890d6ea885 Allowlist prebuilt/r8 for bp2build. 
Bug: 293304784
Test: CI
Change-Id: I513a6f487b32e71a2afc01f7afeecfc3a1eb7f2e
 2023-08-23 11:41:13 -04:00
Mark White
6aac22ac49 Merge "java_library support for building headers-only" into main am: 03fe33ad1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721996

Change-Id: Iadd049c8516dc54027e897c23f9d0d2ea3135e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 15:24:18 +00:00