Florian Mayer
47355233bd
Merge "Reland "Enable hwasan use after scope detection."" am: c9b5aa8138
am: 82d86db1b5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908110
Change-Id: Ia7cb30c0514ab69001c7ab465b9ef4eb7457d8bb
2022-01-21 20:35:03 +00:00
Sam Delmerico
3964495e4c
Merge "bp2build converts java_genrule and java_genrule_host" am: 925a30496a
am: 61294da112
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946827
Change-Id: Ia77f79419691eb2bd9689defe03f7ca466ae6f4a
2022-01-21 20:34:02 +00:00
Florian Mayer
82d86db1b5
Merge "Reland "Enable hwasan use after scope detection."" am: c9b5aa8138
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908110
Change-Id: I66dcbb3c88b285092cd43bde08a79db59a124fd8
2022-01-21 20:00:23 +00:00
Sam Delmerico
61294da112
Merge "bp2build converts java_genrule and java_genrule_host" am: 925a30496a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946827
Change-Id: Ibf448c851647a8e4228f42d1b5d9fae14db53951
2022-01-21 19:59:01 +00:00
Florian Mayer
c9b5aa8138
Merge "Reland "Enable hwasan use after scope detection.""
2022-01-21 19:46:22 +00:00
Sam Delmerico
925a30496a
Merge "bp2build converts java_genrule and java_genrule_host"
2022-01-21 19:43:27 +00:00
Sam Delmerico
cd1b80f067
bp2build converts java_genrule and java_genrule_host
...
Bp2build currently supports building genrules for cc modules, but does
not support building java_genrule* modules. This commit adds this
functionality.
Bug: 213480907
Test: go test ./bp2build
Change-Id: I473196c5bcf5582ba0c8faa65b5005f81ac973a4
2022-01-21 17:50:40 +00:00
Christopher Parsons
4ce9c3c046
Merge "Add bp2build metrics per module type" am: 9811a6ff11
am: be6ce4e6ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956358
Change-Id: I82bb24487957868b425153d29e189794b1b88fe3
2022-01-21 17:21:52 +00:00
Christopher Parsons
be6ce4e6ec
Merge "Add bp2build metrics per module type" am: 9811a6ff11
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956358
Change-Id: Ia95a313318983033bd75bfe2729adc55c031fda0
2022-01-21 17:09:23 +00:00
Christopher Parsons
9811a6ff11
Merge "Add bp2build metrics per module type"
2022-01-21 16:56:35 +00:00
Chris Parsons
492bd91a51
Add bp2build metrics per module type
...
For example, new metrics at HEAD highlight that 99 of 1379 total
cc_library_static modules are converted.
Test: m bp2build, printproto
Change-Id: I6cc4227124e9a130b75911f3e40e6585d731d00a
2022-01-21 11:52:24 -05:00
Jingwen Chen
db371b48a5
Export stub library compiler flags to soong_injection. am: 341f73550d
am: 82f468476b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944691
Change-Id: Idbcf8acf1f1e177846fede7f512a59e38a80db1e
2022-01-21 05:18:39 +00:00
Jingwen Chen
82f468476b
Export stub library compiler flags to soong_injection. am: 341f73550d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944691
Change-Id: I29a25e1e9bba65c6b12ed01a49df62d4584bdbae
2022-01-21 04:48:51 +00:00
Jingwen Chen
341f73550d
Export stub library compiler flags to soong_injection.
...
These are used by the "stub_library" cc toolchain feature.
Test: CI
Bug: 207812332
Change-Id: I392e51f32c92b30b30e85658e7627e16190bdbad
2022-01-21 01:43:13 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
598bcad5ce
Merge "libclang_rt_prebuilt_library_shared mixed builds" am: d1227b20aa
am: 76b40bab19
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1845157
Change-Id: I35857b088a6d92a004b56620b04fe5c3fe24c66b
2022-01-20 21:58:24 +00:00
Treehugger Robot
80a95575bc
Merge "Improve apex build check explanation" am: c85964a734
am: ae0306f79d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1954236
Change-Id: I23fc9f911e3e4589d72e84774e966b5104bb1279
2022-01-20 21:55:56 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
76b40bab19
Merge "libclang_rt_prebuilt_library_shared mixed builds" am: d1227b20aa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1845157
Change-Id: Ifd4d5d502d5e159f0aa7261c3e4875681fb42b48
2022-01-20 21:39:31 +00:00
Treehugger Robot
ae0306f79d
Merge "Improve apex build check explanation" am: c85964a734
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1954236
Change-Id: I9f55fcf2caa7ad033a400f641c0414eb36c82ea0
2022-01-20 21:38:07 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
d1227b20aa
Merge "libclang_rt_prebuilt_library_shared mixed builds"
2022-01-20 21:37:27 +00:00
Treehugger Robot
c85964a734
Merge "Improve apex build check explanation"
2022-01-20 21:06:39 +00:00
Bob Badour
50e3b9c2b7
Merge "Remove header from Android-Apache-2.0 license text." am: 3239bcb16d
am: 3fc2883991
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1955156
Change-Id: I4466e053c1afe42766fa3113c2dd03856ff071cf
2022-01-20 19:37:02 +00:00
Florian Mayer
0edaddf2ce
Reland "Enable hwasan use after scope detection."
...
This reverts commit 77d0035a07
.
Reason for revert: Fixing broken test in topic.
Change-Id: Ia09b6768e725af025522a25ad1289e9380b6bbbd
2022-01-20 19:34:36 +00:00
Bob Badour
3fc2883991
Merge "Remove header from Android-Apache-2.0 license text." am: 3239bcb16d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1955156
Change-Id: Icf09ada20831c7fc361138f8c015fc4114d6be94
2022-01-20 19:19:05 +00:00
Bob Badour
3239bcb16d
Merge "Remove header from Android-Apache-2.0 license text."
2022-01-20 18:58:45 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
c3b97c3568
libclang_rt_prebuilt_library_shared mixed builds
...
Also fix nil deref in setting $LOCAL_SOONG_UNSTRIPPED_BINARY
Bug: 201802518
Test: request_type_test.go
Test: prebuilt_test.go:TestPrebuiltLibrarySharedWithBazel
Test: mixed_{libc,droid}.sh
Change-Id: I22afb56c4b42d3412c2b2e1f079f1bcf8f3129a7
2022-01-20 12:03:18 -05:00
Sorin Basca
cee0e6bf57
Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd
am: a0abe6e74e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197
Change-Id: I69d4f8be013034781a6161c49cc2d17861dc4dfe
2022-01-20 16:23:47 +00:00
Sorin Basca
a0abe6e74e
Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197
Change-Id: I9c756b6b3a9613e867cffdc0c8d957ab64078714
2022-01-20 16:04:38 +00:00
Sorin Basca
e7421c15dd
Merge "Revert "Setting Java 11 as the default version""
2022-01-20 15:38:50 +00:00
Sorin Basca
8d3e0bb25e
Revert "Setting Java 11 as the default version"
...
Revert submission 1944928-default-java11
Reason for revert: Post-submit failures
Reverted Changes:
Ia9a0aa2a4:Setting Java 11 as the default version
Ibf5d10521:Setting Java 11 as the default version
Fixes: 215504708
Fixes: 215502091
Fixes: 215502091
Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29
2022-01-20 15:37:11 +00:00
Sorin Basca
fe7d51f352
Merge "Setting Java 11 as the default version" am: 2c32bbfd73
am: cc0930b609
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707
Change-Id: I2ee5be70e22e374921057c9f172de8b02862df78
2022-01-20 10:57:05 +00:00
Sorin Basca
cc0930b609
Merge "Setting Java 11 as the default version" am: 2c32bbfd73
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707
Change-Id: Iba59feaf0f8df1d2a06e3f3dd66801f5e04f8539
2022-01-20 09:12:32 +00:00
Sorin Basca
2c32bbfd73
Merge "Setting Java 11 as the default version"
2022-01-20 09:00:32 +00:00
Bob Badour
9a76f62f94
Remove header from Android-Apache-2.0 license text.
...
Test: m nothing
Change-Id: I9d59bfe19f3b38977eea4f636cdafe2d0c403600
2022-01-19 14:07:05 -08:00
Andrei Onea
d967aee96f
Improve apex build check explanation
...
Discourage jarjaring code where there are alternatives with
better system health implications.
Test: m
Bug: 215233995
Change-Id: I1b076d00e1ad6aa32b41da6bda1033978b5e829d
2022-01-19 16:07:21 +00:00
Jingwen Chen
e1fc6a20ca
Merge "Support multilib in apex." am: 539d41b686
am: 2cda5749f4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025
Change-Id: Ia251d14ae2344eff2caf409e32e4d9b3712d4ea3
2022-01-19 11:49:14 +00:00
Jingwen Chen
2cda5749f4
Merge "Support multilib in apex." am: 539d41b686
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025
Change-Id: I10a15ca73d2675ad90dedfc03798bd9fc6d36fa8
2022-01-19 11:33:01 +00:00
Jingwen Chen
539d41b686
Merge "Support multilib in apex."
2022-01-19 11:11:05 +00:00
Treehugger Robot
7b49b608f6
Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884
am: 9624d183f4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356
Change-Id: Iad2da65006ea674ee64f525e1d40366b5b68f810
2022-01-19 10:16:31 +00:00
Treehugger Robot
9624d183f4
Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356
Change-Id: Ia51d901307ff3076f00f297c00795e94328f6c01
2022-01-19 09:59:57 +00:00
Treehugger Robot
a9a5d36884
Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder"
2022-01-19 09:41:57 +00:00
Pirama Arumuga Nainar
ebfac819ee
Merge "Revert memory mapped coverage" am: 3ae0b5a7c1
am: 7a1dbabc40
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529
Change-Id: I8b3bfb2aaee3988c07669a759c242fe6d156ffe1
2022-01-19 06:33:30 +00:00
Pirama Arumuga Nainar
7a1dbabc40
Merge "Revert memory mapped coverage" am: 3ae0b5a7c1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529
Change-Id: Ib0b184ea97847976938458d727d16eba3ade9885
2022-01-19 06:18:25 +00:00
Pirama Arumuga Nainar
3ae0b5a7c1
Merge "Revert memory mapped coverage"
2022-01-19 06:03:26 +00:00
Ken Chen
fad7f9d8b7
[NETD-BPF#34] Add a tag for bpf to specify the install folder
...
Currently, the bpf module netd.o (source system/netd/bpf_progs/netd.c)
will be built to /system/etc/bpf/netd.o. In Android T, it will be moved
to mainline module com.android.tethering.
The expected behavior is:
- In T device, it uses the netd.o in mainline module.
- In pre-T devices, it uses the original netd, built from platform.
However, netd.o will be double loaded if the tethering module is
installed in Pre-T devices. Because:
1. bpf in apex is packed into /apex/MAINLINE_MODULE/etc/bpf/
2. bpf in platform is packed into /system/etc/bpf/
3. bpfloader in pre-T loads ANY bpf modules under
/apex/com.android.tethering/etc/bpf/ and /system/etc/bpf/.
We can't change the behavior of bpfloader in pre-T devices. We can't
delete the /system/etc/bpf/netd.o from pre-T devices. Both of them are
not mainline modules. So the mainlined netd.o needs to be packed into a
folder other than /apex/com.android.tethering/etc/bpf/ or
/system/etc/bpf/.
This commit adds a tag 'sub_dir' for bpf module. The installation path
of bpf modules will be:
- /system/etc/bpf/SUB_DIR/ (for platform code)
- /apex/MAINLINE_MODULE/etc/bpf/SUB_DIR/ (for mainline module)
Bug: 202086915
Test: add test in apex_test.go and build
Change-Id: Icc6619768ab006de9f86620a7df1bb2853eaba13
2022-01-19 04:02:29 +00:00
Treehugger Robot
448d71d43f
Merge "Allow tools/vendor to build rust" am: 706ab94ee7
am: 847d13a662
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127
Change-Id: Ib7d05b57fab035f4a85efd03d857568aba0b079c
2022-01-18 22:35:45 +00:00
Treehugger Robot
847d13a662
Merge "Allow tools/vendor to build rust" am: 706ab94ee7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127
Change-Id: I590a796cc09b130d90059a5bef3292e6e97019da
2022-01-18 22:19:38 +00:00
Treehugger Robot
706ab94ee7
Merge "Allow tools/vendor to build rust"
2022-01-18 22:04:14 +00:00
Pirama Arumuga Nainar
aa966c5630
Revert memory mapped coverage
...
Bug: http://b/194128476
Bug: http://b/210012154
Reverts:
e6840726bd
"[coverage] Override -Wframe-larger-than"
71d697c5cb
"Enable memory-mapped coverage instrumentation"
Coverage metrics dropped for ~10 of the 40 modules. There are also
regressions in mainline when running tests on older platform builds.
Test: presubmit
Change-Id: I4a2b005d3b54764b762b5422e03b7a9ec8727227
2022-01-18 13:13:47 -08:00
Yu Liu
4ae55d17f6
Support multilib in apex.
...
Bug: b/208325023
Test: Added unit tests, also tested with adbd apex build manually.
Change-Id: I47e04cd4eb5d05227f0a84683dcb66dff00e3514
2022-01-18 10:38:05 -08:00
Richard Fung
3d11a5698a
Allow tools/vendor to build rust
...
This is necessary to move the mk_payload package from
packages/modules/Virtualization/microdroid to an ARC owned directory.
Bug: 196891323
Test: m -j
Change-Id: Ifa3e509fb4ffa7861e45f69dd4654e8fbe1677ff
2022-01-18 18:26:35 +00:00