Commit Graph

47346 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
2f4a63a7b1 Merge "Add missing team members to OWNERS" am: 54f311d0fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949963

Change-Id: I51ebb20d0183fd8d587e8a9e06db3bc168e5fcec
2022-01-18 15:33:21 +00:00
Treehugger Robot
54f311d0fb Merge "Add missing team members to OWNERS" 2022-01-18 15:14:41 +00:00
Treehugger Robot
d3066c7de1 Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I8d043580d374b2a82dbc78b718dcb86d805119d6
2022-01-18 10:19:12 +00:00
Treehugger Robot
9e46741e73 Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." 2022-01-18 10:02:55 +00:00
Sorin Basca
171c2103b8 Setting Java 11 as the default version
Test: m
Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70
2022-01-18 09:05:34 +00:00
Kousik Kumar
5b34d48a92 Merge "Add additional directories from which env config can be loaded" am: 07d858468e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949705

Change-Id: Ia984c4a469882958c427f8228d475127c60cff62
2022-01-17 16:13:14 +00:00
Kousik Kumar
07d858468e Merge "Add additional directories from which env config can be loaded" 2022-01-17 15:57:01 +00:00
Jingwen Chen
0ee88a6b65 Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build.
This CL turns the stubs.symbol_file and stubs.versions properties into
stubs_symbol_file and stubs_version attributes on the cc_shared_library
target. See associated build/bazel change on how these attributes are
used to generate stub libraries.

Bug: 207812332

Test: New tests
Test: CI
Change-Id: Ie23eafb9903a131d92ff4e251215e998cea0a763
2022-01-17 13:03:12 +00:00
Ivan Lozano
5a7edb74d1 Merge "rust: Fix exported MinSdkVersion" am: 2a1291d01d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944330

Change-Id: I211d113528d2df7d3557cb5815e86a631f6ce733
2022-01-14 23:00:57 +00:00
Liz Kammer
6033198fbb Add missing team members to OWNERS
Change-Id: I30a8e66839655f23b37596098990f269adcdd3cc
2022-01-14 22:47:01 +00:00
Ivan Lozano
2a1291d01d Merge "rust: Fix exported MinSdkVersion" 2022-01-14 22:39:09 +00:00
Ivan Lozano
a91ba25464 rust: Fix exported MinSdkVersion
The exported rust.MinSdkVersion always returns an empty string. Instead
it should return the Min_sdk_version property like rust.minSdkVersion.

This CL renames minSdkVersion to MinSdkVersion so the exported function
has the correct behavior.

Bug: 211858959
Test: m
Change-Id: I4fecfba711c0d3d7a22f4fdf7684924a9457b464
Merged-In: I4fecfba711c0d3d7a22f4fdf7684924a9457b464
2022-01-14 19:57:55 +00:00
Treehugger Robot
b14c2bf5d9 Merge "Update RustDefaultVersion to 1.58.0" am: f2eaa0622f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949166

Change-Id: I31c01488f09c10580c9040bc3b558943f264120a
2022-01-14 19:43:55 +00:00
Treehugger Robot
f2eaa0622f Merge "Update RustDefaultVersion to 1.58.0" 2022-01-14 19:26:06 +00:00
Cole Faust
09b65c0bb6 Merge "Recommend soong_config_set instead of add_soong_config_var_value" am: b379a08eb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949756

Change-Id: I31b01fcb7d5471867fbad75a5ed463581ded67eb
2022-01-14 19:08:45 +00:00
Cole Faust
b379a08eb6 Merge "Recommend soong_config_set instead of add_soong_config_var_value" 2022-01-14 18:50:44 +00:00