StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,000 Commits 1 Branch 0 Tags
699b51c98eed856aae1102313f5afea8a8964bcc
Commit Graph

73000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spandan Das
cb847638af Translate python_libray.pkg_path to proto.import_prefix 
If a python_library uses a pkg_path foo/bar, then the proto srcs in
that libray need to import the dep .proto as foo/bar/proto.proto.

This behavior is restricted to python modules. To implement this is in
bp2build, this CL creates a new interface with a single method
`PkgPath`. Only python module structs implement this interface, and
this method is only available during bp2build

Test: Added a bp2build unit test
Test: TH

Change-Id: If8d207c0b321f75337a053795826b283a5eaaf46
 2023-08-24 19:21:10 +00:00
Spandan Das
e8a90c57e0 Handle proto.include_dirs for java 
The proto_library(s) created for include_dirs will be added to
transitive_deps

This also fixes an existing bug for java_library containing .protos in
srcs via filegroups.
```
java_library {
  name: "foo",
  srcs: ["foo.proto", "foo_filegroup"],
}
```

At ToT, foo_filegroup was missing from the equivalent proto_library in
bp2build workspace.

Bug: 285140726
Test: allowlisted pandora-proto-java and built that
Change-Id: I2657d8cdef2e47434bc3e0d09a074c8e27299afc
 2023-08-24 19:21:10 +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
050f23d2f4 Merge "Fix adding manual ubsan runtime to static glibc binaries" into main am: 55e775f94f am: 14e366fbec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723481

Change-Id: I934a15d4e64f875a966a4583599e64fe4a5c7b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 18:46:15 +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
Jason Wu
5c44f9920f Merge "bp2build converter for sh_test followup" into main am: 66de6c445f am: acb158233c am: 9c5c321b08 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700335

Change-Id: Ib9c7c895ced9bcbfba390478dd042b51e681dfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 17:26:21 +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
9c5c321b08 Merge "bp2build converter for sh_test followup" into main am: 66de6c445f am: acb158233c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700335

Change-Id: I51b92ca8872908e16d051bb9760ffd92e2d0e729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 16:47:00 +00:00
James Farrell
fa03380cd8 Merge "Temporarily disable python precompilation for py3.11" into main am: c36312a64d am: 4979ed83d1 am: d22a7c21d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722593

Change-Id: I5c66a9f855933ab6c5a0a10b168d522d80c19864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 16:07:59 +00: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
James Farrell
d22a7c21d8 Merge "Temporarily disable python precompilation for py3.11" into main am: c36312a64d am: 4979ed83d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722593

Change-Id: I04bcfc5ae25182d9eeac12c4819aab4f77c4f2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 15:28:47 +00:00
Jason Wu
66de6c445f Merge "bp2build converter for sh_test followup" into main 2023-08-24 15:19:28 +00:00
Vinh Tran
e2719083a6 Export RustDefaultVersion to Bazel am: 80f6b2147f am: 4bb0237336 am: 8dcf0c9863 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724373

Change-Id: I45fd9a6c3559f5e6c2f578db4892d97d49d9e25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 14:49:35 +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
8dcf0c9863 Export RustDefaultVersion to Bazel am: 80f6b2147f am: 4bb0237336 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724373

Change-Id: I95671e896316524eb230ae0f17a2a25bf7ffa5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 14:10:52 +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
0893dff343 Merge "Denylist "ota_from_raw_img" module for bp2build" into main am: 55d7f75b76 am: f035930cfc am: 0b146ce790 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724873

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

Change-Id: I30be02da818b9b5a47fc4248c284ea867489b7bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 04:23:53 +00:00
Treehugger Robot
0b146ce790 Merge "Denylist "ota_from_raw_img" module for bp2build" into main am: 55d7f75b76 am: f035930cfc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724873

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

Change-Id: Ib1e557ee2f7c761e9298e2af9540ca2f6631e27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:46:37 +00: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
f108418f7e Merge "Strip zip64 extras after writing local header when copying" into main am: a2dd54de02 am: 2c56414bf5 am: 0ee00998ac 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723476

Change-Id: Ib1719e57062d152b8942432fe39bfee9b1c0f046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 01:48:37 +00:00
Jooyung Han
48615c5c82 Merge changes from topic "deprecate-zip-apex" into main am: 138ee09e28 am: ab1bd8edb8 am: 7d0ce8a610 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722933

Change-Id: I6c317235fe271d835ee6d78eb62bfcdbf4c54505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 01:47:45 +00:00
Colin Cross
0ee00998ac Merge "Strip zip64 extras after writing local header when copying" into main am: a2dd54de02 am: 2c56414bf5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723476

Change-Id: Id292eb08531141b8acbe00a2b879b704c9acfdeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 01:08:38 +00:00
Jooyung Han
7d0ce8a610 Merge changes from topic "deprecate-zip-apex" into main am: 138ee09e28 am: ab1bd8edb8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2722933

Change-Id: I54bd273906838977cff1f16043ae01f5f3ff6369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 01:08:18 +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
dae732d222 Merge "Allowlist prebuilt/r8 for bp2build." into main am: 573eabaa62 am: f9e64d40eb am: 5d4e23f900 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724033

Change-Id: I9855179731113a0085c39a5d89a17ac5b607312e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 21:54:01 +00:00
Romain Jobredeaux
5d4e23f900 Merge "Allowlist prebuilt/r8 for bp2build." into main am: 573eabaa62 am: f9e64d40eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724033

Change-Id: I6cb46fae4f5d73393ae134673a64cf4923104dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 21:14:50 +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
b2e6e4d7cf Merge "Support dynamic config file for cc_test." into main am: 6c50f3ef06 am: e247a40af7 am: 36f239bab2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719717

Change-Id: I97164c02f2d4afceed6339d3bc430fa38f922ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 18:38:59 +00:00
Yu Liu
36f239bab2 Merge "Support dynamic config file for cc_test." into main am: 6c50f3ef06 am: e247a40af7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719717

Change-Id: Ie15954e188eb3cff2ee9e6ef525074f43ea5d04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 17:59:51 +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
Mark White
274bfa7de4 Merge "java_library support for building headers-only" into main am: 03fe33ad1c am: 6aac22ac49 am: 387911421b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721996

Change-Id: I27069fdcced6a98ab50c755d83612627f577d90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 16:42:46 +00:00
Mark White
387911421b Merge "java_library support for building headers-only" into main am: 03fe33ad1c am: 6aac22ac49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721996

Change-Id: I112e804771534b0c20283891e0a170241a021c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 16:04:52 +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