Commit Graph

1161 Commits

Author SHA1 Message Date
Paul Duffin
300ec921e5 Move MAINLINE_MODULE_BY_APEX into the test file
The variable is only used by the tests.

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: I38c4ce218825d79de831868af814c43ce8a6d60f
2022-01-21 19:36:46 +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
Xusong Wang
d0a2fe674b 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: I5e1befb6d6db1f60497b798a70551e1082aab2c1
2022-01-18 22:04:57 +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
Anton Hansson
b55a756193 Remove dead code am: 023527e0a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1952386

Change-Id: I3262b58441f6c927c3a35cbecd61d49abe18e3ee
2022-01-18 15:00:59 +00:00
Anton Hansson
179764caa5 Remove duplicate --hide arguments am: ea32306404
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1952385

Change-Id: I0dfddba1d9f77fd2f55ed9ab0da73da7186aedd6
2022-01-18 15:00:58 +00:00
Anton Hansson
023527e0a9 Remove dead code
This variable was not used.

Test: presubmit
Change-Id: I382c1fe5279450c2f1600328e5e01f435f1572b0
2022-01-17 20:09:57 +00:00
Anton Hansson
ea32306404 Remove duplicate --hide arguments
sdk_library.go already adds these automatically, so they make no
difference.

Test: m
Change-Id: If812d0b840a7142f108ed3e33b96ae5f395481e8
2022-01-17 19:47:03 +00:00
Ivan Lozano
37531877fb Update allowed_deps with additional Rust versions. am: 9da7b0bea7 am: 978b1a40f6 am: e0621cafea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1950028

Change-Id: I1cf1ddb75f082549940465c388b72acfe43867e9
2022-01-15 04:38:30 +00:00
Ivan Lozano
e0621cafea Update allowed_deps with additional Rust versions. am: 9da7b0bea7 am: 978b1a40f6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1950028

Change-Id: Ic27e148fc144a9e9c2cbdfc7552f0770ec2dc6c8
2022-01-15 04:29:05 +00:00
Ivan Lozano
978b1a40f6 Update allowed_deps with additional Rust versions. am: 9da7b0bea7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1950028

Change-Id: I6e88ca44a68136a3d5869661a936b47898ff9017
2022-01-15 04:10:38 +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
12491c5fcf Merge "Update allowed_deps with Rust minSdkVersions." am: c017796bde am: fcdcb9ba2e am: a77925e0e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944386

Change-Id: I409b38afe1f50ec59a1bd1ac14a8901947bc9828
2022-01-14 23:46:34 +00:00
Ivan Lozano
a77925e0e4 Merge "Update allowed_deps with Rust minSdkVersions." am: c017796bde am: fcdcb9ba2e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944386

Change-Id: I4f505bcd293667f730d444abe157be3217302db1
2022-01-14 23:29:18 +00:00
Ivan Lozano
fcdcb9ba2e Merge "Update allowed_deps with Rust minSdkVersions." am: c017796bde
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944386

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

Change-Id: I007f9119fe6fa84ed14569c07358fb13e1a4f5bd
2022-01-14 21:57:23 +00:00
Gabriel Biren
013b253c01 Add Wifi Vendor HAL @1.6 java backend as a dependency. am: b793f38510 am: f34b5b1810
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1949686

Change-Id: If7b4bbb516da561dd390d94e9e28c14e84432117
2022-01-14 21:44:10 +00:00
Gabriel Biren
f34b5b1810 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: I5c27c4ec3b8ef65fd6ad2d2de1c08bae17f3d17f
2022-01-14 21:25:43 +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
1957fcdc97 Add netd_aidl_interface-V8-ndk and netd_aidl_interface-lateststable-ndk am: e0de568105 am: 24fa76139f am: 367de7973d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948979

Change-Id: Id77cf78615843f2884d9e5521047a99c461032e8
2022-01-14 05:27:17 +00:00
Ken Chen
367de7973d Add netd_aidl_interface-V8-ndk and netd_aidl_interface-lateststable-ndk am: e0de568105 am: 24fa76139f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948979

Change-Id: I76a20300c7b9588d3d2cdac435008a61fe54ebaa
2022-01-14 05:16:19 +00:00
Ken Chen
24fa76139f 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: I993abccadaf9859908bab0ee29f07695aea68bb2
2022-01-14 04:59:04 +00:00
Maciej Żenczykowski
8967e501f9 Merge "Include libtcutils in Connectivity / Tethering dependencies" am: 72044038a0 am: ac26bb2f08 am: d26cac5637
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948307

Change-Id: I45f64ed5e8bb485714c6da77695a9c620b5ee3ba
2022-01-14 03:54:04 +00:00
Maciej Żenczykowski
d26cac5637 Merge "Include libtcutils in Connectivity / Tethering dependencies" am: 72044038a0 am: ac26bb2f08
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948307

Change-Id: Icf5d7f2000a112e3d3bb4b859d0d7a48e1448489
2022-01-14 03:37:50 +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
ac26bb2f08 Merge "Include libtcutils in Connectivity / Tethering dependencies" am: 72044038a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1948307

Change-Id: If02fb74a9fc14f0f56599a29994006ac2d828a44
2022-01-14 03:13:41 +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
86a783950b Merge "Add netd_aidl_interface_v8 to allowed_deps." am: d0d701ba68 am: 1949687320 am: dad92b9869
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944565

Change-Id: I85e5d13c86bfb77df90f5c59bcb8362ff280f584
2022-01-13 01:44:34 +00:00
Chiachang Wang
dad92b9869 Merge "Add netd_aidl_interface_v8 to allowed_deps." am: d0d701ba68 am: 1949687320
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1944565

Change-Id: I1595faad83a70c503a0dbc785e52d140ff5c8f2f
2022-01-13 01:27:08 +00:00
Chiachang Wang
1949687320 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: Id5a64503e7fbacb869832dcdce01efe9359ec9c0
2022-01-13 01:15:46 +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
0f554a5477 [automerger skipped] Add clatd to allow_deps.txt am: 5959b56eb6 am: 7b9d8d882a -s ours am: ad008a3477 -s ours
am skip reason: Merged-In I1998f83ffcecf20bc9af9e860f9d21fdf4573515 with SHA-1 3395d79757 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1940953

Change-Id: Ia49b77332ab37c12ce7ae40b7060f2040bb12d1f
2022-01-08 03:36:34 +00:00
Hungming Chen
ad008a3477 [automerger skipped] Add clatd to allow_deps.txt am: 5959b56eb6 am: 7b9d8d882a -s ours
am skip reason: Merged-In I1998f83ffcecf20bc9af9e860f9d21fdf4573515 with SHA-1 3395d79757 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1940953

Change-Id: I0a3abec73d1857ab99bb91a5e16af5212736b41e
2022-01-08 03:23:56 +00:00
Hungming Chen
7b9d8d882a Add clatd to allow_deps.txt am: 5959b56eb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1940953

Change-Id: Ia0a7d4e52fb51eee1b52656c226c524b2cb9ef6a
2022-01-08 03:11:27 +00:00
Hungming Chen
b52150f540 Add clatd to allow_deps.txt am: 3395d79757
Ignore-AOSP-First: merge conflict resolution

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/16583696

Change-Id: I8797ef1509ec660ef54babf1fb74ec964ed68a58
2022-01-08 00:58:49 +00:00
Hungming Chen
3395d79757 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 17:59:52 +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
4b54ff0f08 Merge "Update apex allowed deps for new lib" am: 64b8111824 am: 42369f3696 am: c9f89adb45
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1938217

Change-Id: Ie8fea5389ce1ed1008bdf990b5be17acad17e45f
2022-01-07 06:57:35 +00:00
Chiachang Wang
c9f89adb45 Merge "Update apex allowed deps for new lib" am: 64b8111824 am: 42369f3696
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1938217

Change-Id: I78abbd8d16d431feba89af1e7aa8d1f564da3707
2022-01-07 06:45:21 +00:00
Chiachang Wang
42369f3696 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: Ibb811373a9bd98fa9349d69ca8c68638d7af531d
2022-01-07 06:30:28 +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
84d9aa2ad6 Add libc_headers in allowed_deps. am: a9d0b3a212 am: 4fcdc3664e am: 25edac85d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1938317

Change-Id: I07a8a91de8c49b8bf42547554a14d6ea9dff1306
2022-01-06 12:59:01 +00:00