diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 14:08:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 14:08:35 +0000 |
| commit | 9e7fc935112f9017b4f6bd642e313026b670fa4c (patch) | |
| tree | 4a50f5ce3aad8e651b6aef8fbdd8934a4093f8da | |
| parent | 2c0dcc1e56950b9cfc9b309a8f85c63288b97978 (diff) | |
| parent | f52cc6b3b76070a4a813dfabf7b46ad5ec3eca37 (diff) | |
| download | common-9e7fc935112f9017b4f6bd642e313026b670fa4c.tar.gz | |
Snap for 8745897 from f52cc6b3b76070a4a813dfabf7b46ad5ec3eca37 to tm-frc-neuralnetworks-releaset_frc_neu_330443030t_frc_neu_330443000android13-frc-neuralnetworks-release
Change-Id: I63dd453b24494f94ed2d64ce9d289e393a02c463
| -rw-r--r-- | build/allowed_deps.txt | 3 | ||||
| -rwxr-xr-x | build/mainline_modules_sdks.py | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 6d3e8896..57afbb6a 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -747,6 +747,8 @@ netd-client(minSdkVersion:29) netd_aidl_interface-java(minSdkVersion:29) netd_aidl_interface-lateststable-java(minSdkVersion:29) netd_aidl_interface-lateststable-ndk(minSdkVersion:29) +netd_aidl_interface-V10-java(minSdkVersion:29) +netd_aidl_interface-V10-ndk(minSdkVersion:29) netd_aidl_interface-V3-java(minSdkVersion:29) netd_aidl_interface-V5-java(minSdkVersion:29) netd_aidl_interface-V6-java(minSdkVersion:29) @@ -759,6 +761,7 @@ netd_event_listener_interface-ndk_platform(minSdkVersion:29) netd_event_listener_interface-V1-java(minSdkVersion:29) netd_event_listener_interface-V1-ndk(minSdkVersion:29) netd_event_listener_interface-V1-ndk_platform(minSdkVersion:29) +netd_mainline_headers(minSdkVersion:29) netlink-client(minSdkVersion:29) networkstack-aidl-interfaces-V10-java(minSdkVersion:29) networkstack-aidl-interfaces-V11-java(minSdkVersion:29) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index a4dd1aca..2f4daa6f 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -771,6 +771,8 @@ MAINLINE_MODULES = [ apex="com.android.bluetooth", sdks=["bluetooth-module-sdk"], first_release=Tiramisu, + # Bluetooth has always been and is still optional. + last_optional_release=LATEST, ), MainlineModule( apex="com.android.conscrypt", @@ -861,6 +863,8 @@ MAINLINE_MODULES = [ apex="com.android.uwb", sdks=["uwb-module-sdk"], first_release=Tiramisu, + # Uwb has always been and is still optional. + last_optional_release=LATEST, ), MainlineModule( apex="com.android.wifi", |