Commit Graph

47877 Commits

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

Change-Id: I8da8ad9a94a1ebc3b3e39f36540274b2ed3998f2
2022-01-18 15:47:30 +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
8c48fac4eb Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 am: d3066c7de1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I3ab3e6ea127a7da8850974675b1813294b1a83ea
2022-01-18 10:55:23 +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
Kousik Kumar
4d493fdfda Merge "Add additional directories from which env config can be loaded" am: 07d858468e am: 5b34d48a92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949705

Change-Id: I36a1dddaa6363c51eaab59e6fe7bf4b153a3ba91
2022-01-17 16:30:40 +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
c826593e77 Merge "rust: Fix exported MinSdkVersion" am: 2a1291d01d am: 5a7edb74d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944330

Change-Id: Icc3cd7cd6d2502d1d122d630c78e8df720b6f33d
2022-01-14 23:29:19 +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
Treehugger Robot
29384c8d65 Merge "Update RustDefaultVersion to 1.58.0" am: f2eaa0622f am: b14c2bf5d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949166

Change-Id: I3e72067f5c57438cbb913396afd692207e9e9e67
2022-01-14 20:03:24 +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
8d3cdb2ed6 Merge "Recommend soong_config_set instead of add_soong_config_var_value" am: b379a08eb6 am: 09b65c0bb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949756

Change-Id: I0de4c0cb3ca4d30d1a1dcd80affa67f5da211dc8
2022-01-14 19:20:22 +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
Alexander Smundak
d3b2e26efe Merge "Check missing uncoditionally loaded missing modules at runtime" am: 3f0088944b am: 3b5429811c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944624

Change-Id: Ib7800264675bb034bdb323ab7925bfc4d79339b0
2022-01-14 18:17:46 +00:00
Alexander Smundak
3b5429811c Merge "Check missing uncoditionally loaded missing modules at runtime" am: 3f0088944b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944624

Change-Id: I89e4b09f5d5df20fbe93f23ec3342e1d3f6c9a51
2022-01-14 18:11:23 +00:00
Jiakai Zhang
d437de134a Merge "Allow installing boot images outside of APEX." am: 0cd2a0e2bf am: c1744ee0a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947127

Change-Id: Ifcf459bc0bb8490be43f07636dfab3c1ad8cfad3
2022-01-14 18:10:58 +00:00
Alexander Smundak
3f0088944b Merge "Check missing uncoditionally loaded missing modules at runtime" 2022-01-14 17:56:27 +00:00
Jiakai Zhang
c1744ee0a0 Merge "Allow installing boot images outside of APEX." am: 0cd2a0e2bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947127

Change-Id: I2f027623f2a357f4c1a7d75830e00acf52bf937c
2022-01-14 17:48:20 +00:00
Jiakai Zhang
0cd2a0e2bf Merge "Allow installing boot images outside of APEX." 2022-01-14 17:31:04 +00:00
Liz Kammer
00268b0966 Merge "Change format string %s -> %#v" am: 0bda815c2e am: 68801786aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949440

Change-Id: I3ee6362dd07442ad4c336e0d0d50009a7386c667
2022-01-14 14:51:59 +00:00
Liz Kammer
68801786aa Merge "Change format string %s -> %#v" am: 0bda815c2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949440

Change-Id: Iee8c33e8ccbfa95d24c454579f0b60c801a8f2dd
2022-01-14 14:32:54 +00:00
Liz Kammer
0bda815c2e Merge "Change format string %s -> %#v" 2022-01-14 14:16:40 +00:00
Kousik Kumar
0dcaa969ef Merge "Pass along local resource fraction to reproxy" am: 30754b88f2 am: 2f7e102004
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947558

Change-Id: Ieb0c5fd95f279ca8477a72fed7d97ab5819fa546
2022-01-14 06:08:14 +00:00
Kousik Kumar
2f7e102004 Merge "Pass along local resource fraction to reproxy" am: 30754b88f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947558

Change-Id: Ie0a7b44d6fe70a73a1962b0b7b441fcac5f69cc5
2022-01-14 05:57:00 +00:00
Kousik Kumar
30754b88f2 Merge "Pass along local resource fraction to reproxy" 2022-01-14 05:33:24 +00:00
Kousik Kumar
7b7dca4316 Add additional directories from which env config can be loaded
This is useful for external users to be able to specify their own config files that can be loaded by soong during startup. In addition, we need this for upcoming changes to incorporate an experiments framework in Soong since the config file will be fetched from CDPush and put into the OUT_DIR folder by the config file fetcher binary.

Note: Once this is merged into internal branch, I'll fully get rid of
the vendor/google/ path from Soong in aosp.

Test:
1. Ran a build in aosp with these changes and no config file was loaded.
2. Ran a build in internal master with these changes and the current
config file inside vendor/google was loaded as expected.

Bug: b/214035335
Change-Id: I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb
2022-01-14 00:22:36 -05:00
Cole Faust
d05d5f591f Recommend soong_config_set instead of add_soong_config_var_value
Bug: None
Test: Presubmits
Change-Id: Ib6726436f8eea1b46ce4c30febeae6180f21cceb
2022-01-13 17:19:55 -08:00
Chris Wailes
57c23fa814 Update RustDefaultVersion to 1.58.0
This CL updates the RustDefaultVersion to the new prebuilt version
number and adds an argument to suppress a new linter warning,
non-send-fields-in-send-ty, that is prone to false positives.  See
https://github.com/rust-lang/rust-clippy/issues/8045 for more
information.

Test: m rust
Bug: 213921092
Change-Id: Ide568327f0a8994a6a934d14bb67b3139d0d98da
2022-01-13 17:14:17 -08:00
Treehugger Robot
d300f26df5 Merge "Support installable property" am: 33b4812ce1 am: bc8e52d24f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944807

Change-Id: Ic80ac248a822fc732b07594aece6e4d9c70308c1
2022-01-14 00:32:35 +00:00
Treehugger Robot
bc8e52d24f Merge "Support installable property" am: 33b4812ce1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944807

Change-Id: I6665f9fd718bff6c9f5dbacbbb5f7a3a147dbab2
2022-01-14 00:13:27 +00:00