Commit Graph

261 Commits

Author SHA1 Message Date
Paul Duffin
13e3e100e1 Split populate_stubs out of populate_dist am: 661845d4ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1957399

Change-Id: If7b7efe09606f7fa2f9219d360baa74fcada825e
2022-01-24 14:06:32 +00:00
Paul Duffin
86ef162110 Extract logic for building the snapshots to improve testability am: f5245ce53d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1954695

Change-Id: Ia8be7376929a0cc29074b31562c7e888fce371d5
2022-01-24 14:06:31 +00:00
Paul Duffin
d2b40e7550 Extract subprocess run calls into SubprocessRunner am: b349358ae2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1954694

Change-Id: I5f65d36f33595f90f24f565a7c2dc9eceb602ac2
2022-01-24 14:06:31 +00:00
Paul Duffin
378aa61282 Use unbuffered stdio to make it easy to use print for debugging am: 832cac237c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1954693

Change-Id: I425b8757584418b6330bf5dd5b5f8a9d26e5475a
2022-01-24 14:06:29 +00:00
Paul Duffin
661845d4ec Split populate_stubs out of populate_dist
Separates the logic from populate_dist which handles the legacy stubs
directory into its own populate_stubs directory. That is in preparation
for calling populate_dist multiple times to create sdk snapshots for
different build releases.

Test: atest mainline_modules_sdks_test
      packages/modules/common/build/mainline_modules_sdks.sh
      tree out/dist/mainline-sdks out/dist/stubs
      - check that it is identical to before this change
Bug: 204763318
Change-Id: Idada531b7f88dee3fea861a059a0773bc983853d
2022-01-21 19:36:46 +00:00
Paul Duffin
f5245ce53d Extract logic for building the snapshots to improve testability
Previously, the produce_dist() method of SdkDistProducer was not
testable because it attempted to invoke Soong to build the sdk
snapshots. So, the TestPopulateDist tested the populate_dist() method
instead. That was a problem because it meant that future changes to
the produce_dist() method could not be tested, at least not without
duplicating its functionality.

This change extracts the logic for building the snapshots (i.e. the
code that invokes soong to build the snapshot files) from the
SdkDistProducer into a separate SnapshotBuilder class. That allows
the test to substitute a FakeSnapshotBuilder that generates some fake
sdk snapshot zip files and call produce_dist() instead of calling
populate_dist() and populate_stubs().

It also renames the test to TestProduceDist to reflect that change.

This is part of a larger refactoring to improve the testability of the
mainline_modules_sdks.py file in preparation for adding support for
building build release specific snapshots.

Test: atest mainline_modules_sdks_test
      packages/modules/common/build/mainline_modules_sdks.sh
      tree out/dist/mainline-sdks out/dist/stubs
      - check that it is identical to before this change
Bug: 204763318
Change-Id: Icf2e4b0200cc53863e45cf68208fbc8ec13c6f2c
2022-01-21 19:36:46 +00:00
Paul Duffin
b349358ae2 Extract subprocess run calls into SubprocessRunner
The SdkDistProducer has special stdout/stderr objects to pass to the
subprocess.run. This change extracts the handling of stdout/stderr into
the SubprocessRunner class to allow it to be more easily reused.

This is part of a larger refactoring to improve the testability of the
mainline_modules_sdks.py file in preparation for adding support for
building build release specific snapshots.

Test: atest mainline_modules_sdks_test
      packages/modules/common/build/mainline_modules_sdks.sh
      tree out/dist/mainline-sdks out/dist/stubs
      - check that it is identical to before this change
Change-Id: If40199551934b0620953a2e4e3cefcb61282f051
2022-01-21 19:36:46 +00:00
Paul Duffin
832cac237c Use unbuffered stdio to make it easy to use print for debugging
Previously, debugging using print statements did not work well as print
output to stdout was buffered whereas output from subprocesses was not
which meant that the output was in the wrong order. Passing -u to

Test: packages/modules/common/build/mainline_modules_sdks.sh
Bug: 204763318
Change-Id: Ifa5a5d99b9b8d02987faf949a4a5a63d0712415d
2022-01-21 19:36:46 +00:00
Paul Duffin
092b9fdcfc Add internal only modules to standard module list
Adds the com.android.uwb and com.android.scheduling modules to the
standard list of modules. This ensures that when they are released to
AOSP that the packages/modules/common/build/mainline_modules_sdks.sh
build script will build them correctly.

Ignore-AOSP-First: internal only changes.

Bug: 204763318
Test: vendor/google/build/mainline_modules_sdks.sh
      atest mainline_modules_sdks_test
Merged-In: Idd83a71c477422ddf35d32f0f72293ac6f8626cd
Change-Id: Idd83a71c477422ddf35d32f0f72293ac6f8626cd
(cherry picked from commit adb67d1944)
2022-01-19 12:41:41 +00:00
Xusong Wang
8efa3eaf4b Add android.hardware.neuralnetworks-V4-ndk to allowed_deps. am: b29e69f542
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1949640

Change-Id: I895021a4f54e09d26c15077c26d629003e251fb1
2022-01-18 22:02:11 +00:00
Xusong Wang
b29e69f542 Add android.hardware.neuralnetworks-V4-ndk to allowed_deps.
Apex-Size-Increase: N/A
Previous-Platform-Support: 30
Aosp-First: Yes
Ignore-AOSP-First: merge conflict resolutions
Test-Info: NeuralNetworksTest_static,VtsHalNeuralnetworksTargetTest

Bug: 202431255
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Iea35b4faaf304b60f1bb054ac91c35649c5148e8
Merged-In: Iea35b4faaf304b60f1bb054ac91c35649c5148e8
(cherry picked from commit c85c20089f)
2022-01-18 10:48:35 -08:00
Ivan Lozano
cc31846f7d Update allowed_deps with additional Rust versions. am: 9da7b0bea7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1950028

Change-Id: Ica3e503294719b345d0a78b60fe2718c55dc7f52
2022-01-15 04:10:25 +00:00
Ivan Lozano
9da7b0bea7 Update allowed_deps with additional Rust versions.
Rust was incorrectly reporting the minSdkVersion. Update a few remaining
version values.

Bug: 211858959
Bug: 214625677
Test: packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: I19cf1009659b7b504bb37616ef7e9f19b439e2d7
2022-01-14 21:17:41 -05:00
Ivan Lozano
3eeeaf69d1 Merge "Update allowed_deps with Rust minSdkVersions." am: c017796bde
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944386

Change-Id: I419f05f2dbd18c8894487d95efb03bca9147ebb1
2022-01-14 22:59:49 +00:00
Ivan Lozano
c017796bde Merge "Update allowed_deps with Rust minSdkVersions." 2022-01-14 22:39:09 +00:00
Gabriel Biren
95db648712 Add Wifi Vendor HAL @1.6 java backend as a dependency. am: b793f38510
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1949686

Change-Id: I2e034b39e9b97082c74e7acecd73242dd4f11411
2022-01-14 21:24:56 +00:00
Ivan Lozano
c1a897636f Update allowed_deps with Rust minSdkVersions.
Rust was incorrectly reporting the minSdkVersion. After fixing this, the
allowed_deps.txt needs updating with the correct version values.

Bug: 211858959
Test: packages/modules/common/build/update-apex-allowed-deps.sh
Test: m
Change-Id: I27a0bb410b9baf818dfd8581a04de720c470b30b
Merged-In: I27a0bb410b9baf818dfd8581a04de720c470b30b
2022-01-14 19:58:24 +00:00
Gabriel Biren
b793f38510 Add Wifi Vendor HAL @1.6 java backend as a dependency.
Apex-Size-Increase: 30KB
Aosp-First: Yes
Previous-Platform-Support: N/A
Test-Info: Wifi functional tests.

Bug: 214108561
Test: Build succeeds
Change-Id: I61c9f91021be62a4bae0ccea929292d7ba514a32
2022-01-14 18:27:23 +00:00
Ken Chen
4eabf09742 Add netd_aidl_interface-V8-ndk and netd_aidl_interface-lateststable-ndk am: e0de568105
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948979

Change-Id: I7620c39b5c017c4e10d9bb165b4c48a397424dd0
2022-01-14 04:58:53 +00:00
Ken Chen
e0de568105 Add netd_aidl_interface-V8-ndk and netd_aidl_interface-lateststable-ndk
Apex-Size-Increase: negligible
Just replace netd_aidl_interface-V7 with V8 which has one
more field in NativeNetworkConfig

Previous-Platform-Support: Yes, support previous platform releases

Aosp-First: Yes

Test-Info: all unit tests related to Connectivity/netd

Bug: 184750836
Test: atest FrameworksNetTests
Test: cd system/netd ; atest
Change-Id: Id26c314d60cc733bfdf7695e2f844fe6751eb6e7
2022-01-14 11:30:15 +08:00
Maciej Żenczykowski
73b8e931ec Merge "Include libtcutils in Connectivity / Tethering dependencies" am: 72044038a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948307

Change-Id: Ia4ec0a11aa67c8d2a62f6cb4c6346a35e28f7435
2022-01-14 03:13:32 +00:00
Maciej Żenczykowski
72044038a0 Merge "Include libtcutils in Connectivity / Tethering dependencies" 2022-01-14 02:53:15 +00:00
Patrick Rohr
9280509111 Include libtcutils in Connectivity / Tethering dependencies
Apex-Size-Increase: libtcutils.a is 40K
Previous-Platform-Support: Yes, no direct platform dependencies (just kernel)
Aosp-First: AOSP-first
Test-Info: moving code, existing TetheringModule tests are already
covering this.
Bug: 202086915
Bug: 157552970
Test: builds

Change-Id: I85041c3323de4eefb6ae1c2ad53596029d271cd6
2022-01-13 06:45:34 +01:00
Chiachang Wang
793fc99f20 Merge "Add netd_aidl_interface_v8 to allowed_deps." am: d0d701ba68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944565

Change-Id: Ibdc22f4304ee65915bcbd65f350adc62164bbdfa
2022-01-13 01:15:36 +00:00
Chiachang Wang
d0d701ba68 Merge "Add netd_aidl_interface_v8 to allowed_deps." 2022-01-13 00:57:49 +00:00
Chiachang Wang
a53097d93c Add netd_aidl_interface_v8 to allowed_deps.
Apex-Size-Increase: negligible
Just replace netd_aidl_interface-V7 with V8 which has one
more field in NativeNetworkConfig

Previous-Platform-Support: Yes, support previous platform releases

Aosp-First: Yes

Test-Info: all unit tests related to Connectivity/netd

Bug: 184750836
Test: atest FrameworksNetTests
Test: cd system/netd ; atest
Change-Id: I4887f9bb59b0050e6b0065a95e0af571a9426e3a
2022-01-11 11:31:26 +08:00
Hungming Chen
94067052ed Add clatd to allow_deps.txt am: 5959b56eb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1940953

Change-Id: I48c4b16ed54cd71b75dfda0facb2644172a08578
2022-01-08 03:11:17 +00:00
Hungming Chen
5959b56eb6 Add clatd to allow_deps.txt
Needed because clatd is going to be modularized.

Apex-Size-Increase: 32768B
before:
out/target/product/raven/system/apex/com.android.tethering.apex
-rw-r--r-- 1 nuccachen primarygroup 2965504 Jan  7 18:56 out/target/product/raven/system/apex/com.android.tethering.apex
after:
-rw-r--r-- 1 nuccachen primarygroup 2998272 Jan  7 19:02 out/target/product/raven/system/apex/com.android.tethering.apex

clatd binary size: 24408B
$ deapexer extract out/target/product/raven/system/apex/com.android.tethering.apex apex
$ ls -all apex/bin/clatd
-rwxr-xr-x 1 nuccachen primarygroup 24408 Jan  1  1970 apex/bin/clatd

Previous-Platform-Support: no

Aosp-First: yes

Ignore-AOSP-First: merge conflict resolutions

Test-Info: atest clatd_test
Test: TH

Bug: 212345928
Change-Id: I1998f83ffcecf20bc9af9e860f9d21fdf4573515
Merged-In: I1998f83ffcecf20bc9af9e860f9d21fdf4573515
2022-01-07 19:24:04 +08:00
Chiachang Wang
ae55a9d8ad Merge "Update apex allowed deps for new lib" am: 64b8111824
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1938217

Change-Id: I0f0e034733ac9c04820a025450bfe22eac09934d
2022-01-07 06:30:21 +00:00
Chiachang Wang
64b8111824 Merge "Update apex allowed deps for new lib" 2022-01-07 06:16:26 +00:00
Chiachang Wang
5c5e2fd8bd Update apex allowed deps for new lib
The 32Shims was added intended for TIRAMISU, but the actually
code for TIRAMISU is not 32. Thus, replace 32Shims with 33Shims
and update the corresponding usage.

Bug: N/A
Test: run update-apex-allowed-deps.sh
Aosp-First: Yes
Test-Info: m ; run update-apex-allowed-deps.sh
Apex-Size-Increase: 0. Only rename the lib
Previous-Platform-Support: Yes

Change-Id: I11a34429373c433535285ce5a11a51fbd16f62cf
2022-01-07 09:43:02 +08:00
Nicolas Geoffray
7650daf092 Add libc_headers in allowed_deps. am: a9d0b3a212
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1938317

Change-Id: I4f2a5b65ac146e11c65344ef9a2b6cfb8a6db696
2022-01-06 12:28:05 +00:00
Nicolas Geoffray
a9d0b3a212 Add libc_headers in allowed_deps.
Needed for successfully invoking
vendor/google/modules/ArtGoogle/build-art-module.sh in mainline-art-dev.

Test: vendor/google/modules/ArtGoogle/build-art-module.sh
Change-Id: I5bfd0305f6433fa9c0138f0827b361c151779e14
2022-01-06 10:05:45 +00:00
Hungming Chen
df0d9bdaad Add libip_checksum to allow_deps.txt am: e81082ddfe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1934198

Change-Id: I2ac0d50378bc2d109dbd345b9f8927dde78b9189
2021-12-28 23:00:12 +00:00
Hungming Chen
e81082ddfe Add libip_checksum to allow_deps.txt
Needed because the new dependencies of libip_checksum is required for
moving clatd into tethering module.

Apex-Size-Increase: 8192B
before:
out/target/product/raven/system/apex/com.android.tethering.apex
-rw-r----- 1 nuccachen primarygroup 2961408 Dec 25 15:44 out/target/product/raven/system/apex/com.android.tethering.apex
after:
out/target/product/raven/system/apex/com.android.tethering.apex
-rw-r----- 1 nuccachen primarygroup 2969600 Dec 25 15:58 out/target/product/raven/system/apex/com.android.tethering.apex

Previous-Platform-Support: yes
libip_checksum is a static library.
tethering module links libip_checksum statically.

Aosp-First: yes

Ignore-AOSP-First: merge conflict resolutions

Test-Info: atest libclat and manual test to check modified clatd works
We will be adding integration test.
Test: TH

Bug: 212345928
Change-Id: Ieba9e2819e225aa7f40e0df219c2c6b9eebf9efe
Merged-In: Ieba9e2819e225aa7f40e0df219c2c6b9eebf9efe
2021-12-28 14:40:14 -08:00
Ken Chen
a3033197ef Rename bpf_map_utils to bpf_headers am: d1c090c8ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1925625

Change-Id: I02e51a2790cbfb3eddac66fd5f3d2143d1bacb0f
2021-12-23 16:51:35 +00:00
Ken Chen
d1c090c8ff Rename bpf_map_utils to bpf_headers
Use a generic name so that it can contain more bpf related headers.

Bug: 202086915
Test: build

Apex-Size-Increase: 0
Previous-Platform-Support: Yes
Aosp-First: Yes
Test-Info: m; flash; boot
Change-Id: I8f94a8ef2cf7cc25737847e706e42813f9d05aee
2021-12-23 09:43:13 +08:00
Jiyong Park
76f8df87ae Add fmtlib_headers to the allowed list. am: 5edb66c5b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1922120

Change-Id: I09d9e5e26f4c0ab1f82e65e0e3c0f1486a226a94
2021-12-20 14:44:23 +00:00
Jiyong Park
5edb66c5b5 Add fmtlib_headers to the allowed list.
fmtlib has been in the list. The header variant of the lib was created
and it needs to be added as well.

Bug: 209929099
Test: m
Test-Info: No behavior change. fmtlib has been in the allow list. The
header variant of the lib was created and it is used in the header-only
contexts.
Apex-Size-Increase: 0
Previous-Platform-Support: 29 (the same as min_sdk_version of fmtlib)
Aosp-First: Yes.

Change-Id: Ic430285fdb2d64077e6d61c81c78aab4a9842ed7
2021-12-20 13:43:27 +09:00
Alan Viverette
89a67cdb13 Update allowed_deps.txt to account for correct library target names
No new dependencies.

Bug: 197802324
Test: Global presubmit
Change-Id: I69c769b1b51cec5fd98ba312edc9b6610df8cdd4
Merged-In: I69c769b1b51cec5fd98ba312edc9b6610df8cdd4
(cherry picked from commit 59ba4d4460)
2021-12-15 15:38:22 -08:00
Alan Viverette
737bceeaae Update allowed_deps.txt to account for correct library target names
No new dependencies.

Bug: 197802324
Test: Global presubmit
Change-Id: I69c769b1b51cec5fd98ba312edc9b6610df8cdd4
Merged-In: I69c769b1b51cec5fd98ba312edc9b6610df8cdd4
(cherry picked from commit 59ba4d4460)
2021-12-15 14:38:05 -08:00
satayev
b55a4286b3 Disable ipsec and tethering module builds on postsubmit. am: 236d765ba3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1924422

Change-Id: I27e890002de0f9f8c465ffe47e2db57089350f4b
2021-12-15 17:53:58 +00:00
satayev
236d765ba3 Disable ipsec and tethering module builds on postsubmit.
We are enabling continous postsubmit builds for AOSP modules. These
modules are not building at ToT at the moment; exclude them so we can
get a green postsubmit build for other modules.

Bug: 210694291
Test: run packages/modules/common/build/mainline_modules_x86_64.sh locally
Change-Id: Iea756639962e5c87a4ae5539890a9ab8909286c3
2021-12-15 16:03:43 +00:00
Santiago Seifert
71d0393ec6 Merge "Add ExoPlayer-related targets to allowed_deps" am: 1c24e77b31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1916560

Change-Id: I3a29c1428d61b0c7055720a155bb7df30093371d
2021-12-10 18:09:29 +00:00
Santiago Seifert
10a68b7f21 Add ExoPlayer-related targets to allowed_deps
Bug: 203391388
Test: m
Test-Info: No behavior change. The media apex already
depends on ExoPlayer targets.
Apex-Size-Increase: 0. Dependency already exists in the media apex.
Previous-Platform-Support: No behavior change. The media apex already
depends on ExoPlayer targets.
Aosp-First: Yes.
Change-Id: Iaa097dab34800549f8d0aee425c1de3d34cd4317

Change-Id: Id0399050a44a16f03fb5f99c48f3295ecee18e41
2021-12-09 16:09:19 +00:00
Santiago Seifert
2256db93c4 Add error_prone sdk 29 to allowed_deps am: ae6e8ee5d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1913807

Change-Id: I98956ddfee1756f73ce0381a222ef234da02008d
2021-12-08 13:55:11 +00:00
Santiago Seifert
ae6e8ee5d3 Add error_prone sdk 29 to allowed_deps
Bug: 203391388
Test: m
Change-Id: I804f4e5aef2cc2542738a208b5556a7f38319bc5
2021-12-07 16:48:57 +00:00
Ken Chen
725f65f16e [NETD-BPF#31] Update allowed_deps.txt for bpf_map_utils am: cbb0238405
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1873879

Change-Id: Iff45a500523b9b432ec1be86cbe7a1c90909a5e8
2021-12-06 17:51:01 +00:00
Ken Chen
cbb0238405 [NETD-BPF#31] Update allowed_deps.txt for bpf_map_utils
bpf_map_utils is referenced by libconn_for_netd in Tethering module.

Bug: 202086915
Test: see below

Apex-Size-Increase: 0. Adding a header file in cc_library_headers does
                    not increase apex size.
Previous-Platform-Support: Yes
Aosp-First: Yes
Test-Info: 1. m; flash; boot
           2. cd system/netd && atest
           3. cd packages/modules/Connectivity && atest
           4. atest FrameworksNetTests
Change-Id: Ie9281dce11593ac9072a4626afdb5fa3ebb48f34
2021-12-06 03:19:40 +00:00
Ken Chen
971f29edc3 Merge "[NETD-BPF#7] Update dependency for moving bpf_shared.h" am: 29cfb321e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1869325

Change-Id: I3556db1fb0d2fe1fe6793e5b596d2f93f0187751
2021-12-03 09:26:47 +00:00