diff options
| -rw-r--r-- | MODULES_OWNERS | 5 | ||||
| -rw-r--r-- | build/allowed_deps.txt | 157 | ||||
| -rwxr-xr-x | build/build_unbundled_mainline_module.sh | 7 | ||||
| -rwxr-xr-x | build/mainline_modules_sdks.py | 27 | ||||
| -rwxr-xr-x | build/mainline_modules_sdks.sh | 29 | ||||
| -rw-r--r-- | build/mainline_modules_sdks_test.py | 13 | ||||
| -rw-r--r-- | proto/classpaths.proto | 1 | ||||
| -rw-r--r-- | sdk/ModuleDefaults.bp | 8 |
8 files changed, 162 insertions, 85 deletions
diff --git a/MODULES_OWNERS b/MODULES_OWNERS index 1db0ed04..d04cb101 100644 --- a/MODULES_OWNERS +++ b/MODULES_OWNERS @@ -7,5 +7,8 @@ # # See go/mainline-owners-policy for more details. -mathewi@google.com #{LAST_RESORT_SUGGESTION} hansson@google.com #{LAST_RESORT_SUGGESTION} +satayev@google.com #{LAST_RESORT_SUGGESTION} + +# backup: +dariofreni@google.com #{LAST_RESORT_SUGGESTION} diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 8e17d599..d1887f48 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -42,6 +42,7 @@ android.hardware.media@1.0(minSdkVersion:29) android.hardware.neuralnetworks-V1-ndk(minSdkVersion:30) android.hardware.neuralnetworks-V1-ndk_platform(minSdkVersion:30) android.hardware.neuralnetworks-V2-ndk(minSdkVersion:30) +android.hardware.neuralnetworks-V3-ndk(minSdkVersion:30) android.hardware.neuralnetworks@1.0(minSdkVersion:30) android.hardware.neuralnetworks@1.1(minSdkVersion:30) android.hardware.neuralnetworks@1.2(minSdkVersion:30) @@ -56,6 +57,7 @@ android.hardware.wifi-V1.2-java(minSdkVersion:30) android.hardware.wifi-V1.3-java(minSdkVersion:30) android.hardware.wifi-V1.4-java(minSdkVersion:30) android.hardware.wifi-V1.5-java(minSdkVersion:30) +android.hardware.wifi-V1.6-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.0-java(minSdkVersion:30) android.hardware.wifi.hostapd-V1.1-java(minSdkVersion:30) @@ -104,8 +106,8 @@ androidx.customview_customview(minSdkVersion:14) androidx.documentfile_documentfile(minSdkVersion:14) androidx.drawerlayout_drawerlayout(minSdkVersion:14) androidx.dynamicanimation_dynamicanimation(minSdkVersion:14) -androidx.emoji2_emoji(minSdkVersion:14) -androidx.emoji2_emoji2-views-helpe(minSdkVersion:14) +androidx.emoji2_emoji2(minSdkVersion:14) +androidx.emoji2_emoji2-views-helper(minSdkVersion:14) androidx.exifinterface_exifinterface(minSdkVersion:14) androidx.fragment_fragment(minSdkVersion:14) androidx.fragment_fragment-ktx(minSdkVersion:14) @@ -177,11 +179,14 @@ bionic_libc_platform_headers(minSdkVersion:29) boringssl_self_test(minSdkVersion:29) bouncycastle(minSdkVersion:31) bouncycastle-unbundled(minSdkVersion:30) +bpf_connectivity_headers(minSdkVersion:30) +bpf_headers(minSdkVersion:30) bpf_syscall_wrappers(minSdkVersion:30) brotli-java(minSdkVersion:current) captiveportal-lib(minSdkVersion:29) car-rotary-lib(minSdkVersion:28) car-ui-lib(minSdkVersion:28) +clatd(minSdkVersion:30) codecs_g711dec(minSdkVersion:29) com.google.android.material_material(minSdkVersion:14) conscrypt(minSdkVersion:29) @@ -208,6 +213,8 @@ crtend_so(minSdkVersion:current) datastallprotosnano(minSdkVersion:29) dnsproxyd_protocol_headers(minSdkVersion:29) DocumentsUI-res-lib(minSdkVersion:29) +exoplayer2-annotation-stubs(minSdkVersion:16) +exoplayer2-extractor(minSdkVersion:16) exoplayer2.15.1(minSdkVersion:16) ExtServices(minSdkVersion:30) ExtServices(minSdkVersion:current) @@ -215,6 +222,7 @@ ExtServices-core(minSdkVersion:30) ExtServices-core(minSdkVersion:current) flatbuffer_headers(minSdkVersion:(no version)) fmtlib(minSdkVersion:29) +fmtlib_headers(minSdkVersion:29) fmtlib_ndk(minSdkVersion:29) fp16_headers(minSdkVersion:30) framework-mediaprovider(minSdkVersion:30) @@ -252,18 +260,23 @@ kotlinx_coroutines_android(minSdkVersion:28) ksoap2(minSdkVersion:30) libaacextractor(minSdkVersion:29) libadbconnection_server(minSdkVersion:(no version)) +libadbconnection_server(minSdkVersion:30) libadbd_core(minSdkVersion:(no version)) +libadbd_core(minSdkVersion:30) libadbd_services(minSdkVersion:(no version)) +libadbd_services(minSdkVersion:30) libaidlcommonsupport(minSdkVersion:29) -liballoc.rust_sysroot(minSdkVersion:(no version)) +liballoc.rust_sysroot(minSdkVersion:29) libamrextractor(minSdkVersion:29) -libandroid_log_sys(minSdkVersion:(no version)) -libandroid_logger(minSdkVersion:(no version)) -libanyhow(minSdkVersion:(no version)) +libandroid_log_sys(minSdkVersion:29) +libandroid_logger(minSdkVersion:29) +libanyhow(minSdkVersion:29) libapp_processes_protos_lite(minSdkVersion:(no version)) +libapp_processes_protos_lite(minSdkVersion:30) libarect(minSdkVersion:29) libasync_safe(minSdkVersion:apex_inherit) libasyncio(minSdkVersion:(no version)) +libasyncio(minSdkVersion:apex_inherit) libatomic(minSdkVersion:(no version)) libaudio_system_headers(minSdkVersion:29) libaudioclient_aidl_conversion_util(minSdkVersion:29) @@ -276,10 +289,10 @@ libavcenc(minSdkVersion:29) libavservices_minijail(minSdkVersion:29) libbacktrace(minSdkVersion:apex_inherit) libbacktrace_headers(minSdkVersion:apex_inherit) -libbacktrace_rs.rust_sysroot(minSdkVersion:(no version)) -libbacktrace_sys.rust_sysroot(minSdkVersion:(no version)) +libbacktrace_rs.rust_sysroot(minSdkVersion:29) +libbacktrace_sys.rust_sysroot(minSdkVersion:29) libbase(minSdkVersion:29) -libbase64_rust(minSdkVersion:(no version)) +libbase64_rust(minSdkVersion:29) libbase_headers(minSdkVersion:29) libbase_ndk(minSdkVersion:29) libbinder_headers(minSdkVersion:29) @@ -288,7 +301,8 @@ libbinderthreadstateutils(minSdkVersion:29) libbluetooth-types-header(minSdkVersion:29) libbrotli(minSdkVersion:(no version)) libbuildversion(minSdkVersion:(no version)) -libbytes(minSdkVersion:(no version)) +libbuildversion(minSdkVersion:26) +libbytes(minSdkVersion:29) libc++(minSdkVersion:apex_inherit) libc++_static(minSdkVersion:apex_inherit) libc++abi(minSdkVersion:apex_inherit) @@ -299,8 +313,8 @@ libc_headers_arch(minSdkVersion:apex_inherit) libc_llndk_headers(minSdkVersion:apex_inherit) libc_scudo(minSdkVersion:apex_inherit) libcap(minSdkVersion:29) -libcfg_if(minSdkVersion:(no version)) -libcfg_if.rust_sysroot(minSdkVersion:(no version)) +libcfg_if(minSdkVersion:29) +libcfg_if.rust_sysroot(minSdkVersion:29) libcodec2(minSdkVersion:29) libcodec2_headers(minSdkVersion:29) libcodec2_hidl@1.0(minSdkVersion:29) @@ -339,22 +353,25 @@ libcodec2_soft_vp8enc(minSdkVersion:29) libcodec2_soft_vp9dec(minSdkVersion:29) libcodec2_soft_vp9enc(minSdkVersion:29) libcodec2_vndk(minSdkVersion:29) -libcompiler_builtins.rust_sysroot(minSdkVersion:(no version)) -libcore.rust_sysroot(minSdkVersion:(no version)) +libcom_android_networkstack_tethering_util_jni(minSdkVersion:30) +libcompiler_builtins.rust_sysroot(minSdkVersion:29) +libcore.rust_sysroot(minSdkVersion:29) libcrypto(minSdkVersion:29) libcrypto_static(minSdkVersion:(no version)) libcrypto_utils(minSdkVersion:(no version)) +libcrypto_utils(minSdkVersion:apex_inherit) libcutils(minSdkVersion:29) libcutils_headers(minSdkVersion:29) libcutils_sockets(minSdkVersion:29) libdexfile_external_headers(minSdkVersion:31) libdexfile_support(minSdkVersion:31) libdiagnose_usb(minSdkVersion:(no version)) +libdiagnose_usb(minSdkVersion:apex_inherit) libdmabufheap(minSdkVersion:29) libdmabufinfo(minSdkVersion:S) -libdoh_ffi(minSdkVersion:(no version)) +libdoh_ffi(minSdkVersion:29) libeigen(minSdkVersion:(no version)) -libenv_logger(minSdkVersion:(no version)) +libenv_logger(minSdkVersion:29) libexpat(minSdkVersion:apex_inherit) libextservices(minSdkVersion:30) libextservices_jni(minSdkVersion:30) @@ -366,21 +383,21 @@ libFLAC-headers(minSdkVersion:29) libflacextractor(minSdkVersion:29) libfmq(minSdkVersion:29) libfmq-base(minSdkVersion:29) -libform_urlencoded(minSdkVersion:(no version)) +libform_urlencoded(minSdkVersion:29) libFraunhoferAAC(minSdkVersion:29) libfuse(minSdkVersion:30) libfuse_jni(minSdkVersion:30) -libfutures(minSdkVersion:(no version)) -libfutures_channel(minSdkVersion:(no version)) -libfutures_core(minSdkVersion:(no version)) -libfutures_executor(minSdkVersion:(no version)) -libfutures_io(minSdkVersion:(no version)) -libfutures_sink(minSdkVersion:(no version)) -libfutures_task(minSdkVersion:(no version)) -libfutures_util(minSdkVersion:(no version)) +libfutures(minSdkVersion:29) +libfutures_channel(minSdkVersion:29) +libfutures_core(minSdkVersion:29) +libfutures_executor(minSdkVersion:29) +libfutures_io(minSdkVersion:29) +libfutures_sink(minSdkVersion:29) +libfutures_task(minSdkVersion:29) +libfutures_util(minSdkVersion:29) libgav1(minSdkVersion:29) libgcc_stripped(minSdkVersion:(no version)) -libgetopts(minSdkVersion:(no version)) +libgetopts(minSdkVersion:29) libgralloctypes(minSdkVersion:29) libgrallocusage(minSdkVersion:29) libgsm(minSdkVersion:apex_inherit) @@ -390,31 +407,32 @@ libgui_bufferqueue_static(minSdkVersion:29) libgui_headers(minSdkVersion:29) libhardware(minSdkVersion:29) libhardware_headers(minSdkVersion:29) -libhashbrown.rust_sysroot(minSdkVersion:(no version)) +libhashbrown.rust_sysroot(minSdkVersion:29) libhevcdec(minSdkVersion:29) libhevcenc(minSdkVersion:29) libhidlbase(minSdkVersion:29) libhidlmemory(minSdkVersion:29) libhwbinder-impl-internal(minSdkVersion:29) libhwbinder_headers(minSdkVersion:29) -libidna(minSdkVersion:(no version)) +libidna(minSdkVersion:29) libion(minSdkVersion:29) +libip_checksum(minSdkVersion:30) libjsoncpp(minSdkVersion:29) libkll(minSdkVersion:30) libkll-encoder(minSdkVersion:30) libkll-protos(minSdkVersion:30) -liblazy_static(minSdkVersion:(no version)) -liblibc(minSdkVersion:(no version)) -liblibc.rust_sysroot(minSdkVersion:(no version)) +liblazy_static(minSdkVersion:29) +liblibc(minSdkVersion:29) +liblibc.rust_sysroot(minSdkVersion:29) libLibGuiProperties(minSdkVersion:29) -liblibm(minSdkVersion:(no version)) +liblibm(minSdkVersion:29) liblog_headers(minSdkVersion:29) -liblog_rust(minSdkVersion:(no version)) +liblog_rust(minSdkVersion:29) liblua(minSdkVersion:(no version)) liblua(minSdkVersion:30) liblz4(minSdkVersion:(no version)) liblzma(minSdkVersion:apex_inherit) -libmatches(minSdkVersion:(no version)) +libmatches(minSdkVersion:29) libmath(minSdkVersion:29) libmath_headers(minSdkVersion:apex_inherit) libmdnssd(minSdkVersion:(no version)) @@ -424,7 +442,7 @@ libmedia_headers(minSdkVersion:29) libmedia_helper_headers(minSdkVersion:29) libmedia_midiiowrapper(minSdkVersion:29) libmediaformatshaper(minSdkVersion:29) -libmemchr(minSdkVersion:(no version)) +libmemchr(minSdkVersion:29) libmeminfo(minSdkVersion:S) libminijail(minSdkVersion:29) libminijail_gen_constants(minSdkVersion:(no version)) @@ -432,7 +450,7 @@ libminijail_gen_constants_obj(minSdkVersion:29) libminijail_gen_syscall(minSdkVersion:(no version)) libminijail_gen_syscall_obj(minSdkVersion:29) libminijail_generated(minSdkVersion:29) -libmio(minSdkVersion:(no version)) +libmio(minSdkVersion:29) libmkvextractor(minSdkVersion:29) libmp3extractor(minSdkVersion:29) libmp4extractor(minSdkVersion:29) @@ -453,18 +471,18 @@ libnetworkstackutilsjni(minSdkVersion:29) libneuralnetworks_common(minSdkVersion:(no version)) libneuralnetworks_headers(minSdkVersion:(no version)) libneuralnetworks_shim_static(minSdkVersion:30) -libnum_cpus(minSdkVersion:(no version)) +libnum_cpus(minSdkVersion:29) liboggextractor(minSdkVersion:29) -libonce_cell(minSdkVersion:(no version)) +libonce_cell(minSdkVersion:29) libopenjdkjvmti_headers(minSdkVersion:31) libopus(minSdkVersion:29) -libpanic_abort.rust_sysroot(minSdkVersion:(no version)) -libpercent_encoding(minSdkVersion:(no version)) +libpanic_abort.rust_sysroot(minSdkVersion:29) +libpercent_encoding(minSdkVersion:29) libperfetto_client_experimental(minSdkVersion:S) -libpin_project_lite(minSdkVersion:(no version)) -libpin_utils(minSdkVersion:(no version)) +libpin_project_lite(minSdkVersion:29) +libpin_utils(minSdkVersion:29) libPlatformProperties(minSdkVersion:S) -libproc_macro_nested(minSdkVersion:(no version)) +libproc_macro_nested(minSdkVersion:29) libprocessgroup(minSdkVersion:29) libprocessgroup_headers(minSdkVersion:29) libprocinfo(minSdkVersion:apex_inherit) @@ -474,25 +492,25 @@ libprofile-clang-extras_cfi_support(minSdkVersion:(no version)) libprofile-clang-extras_ndk(minSdkVersion:(no version)) libprofile-extras(minSdkVersion:(no version)) libprofile-extras_ndk(minSdkVersion:(no version)) -libprofiler_builtins.rust_sysroot(minSdkVersion:(no version)) +libprofiler_builtins.rust_sysroot(minSdkVersion:29) libprotobuf-cpp-lite(minSdkVersion:29) libprotobuf-java-lite(minSdkVersion:current) libprotobuf-java-nano(minSdkVersion:9) libprotoutil(minSdkVersion:(no version)) libqemu_pipe(minSdkVersion:(no version)) -libquiche(minSdkVersion:(no version)) -libring(minSdkVersion:(no version)) +libquiche(minSdkVersion:29) +libring(minSdkVersion:29) libring-core(minSdkVersion:29) libring-test(minSdkVersion:29) librustc_demangle(minSdkVersion:(no version)) -librustc_demangle.rust_sysroot(minSdkVersion:(no version)) +librustc_demangle.rust_sysroot(minSdkVersion:29) librustc_demangle_static(minSdkVersion:(no version)) libruy_static(minSdkVersion:30) libsfplugin_ccodec_utils(minSdkVersion:29) -libslab(minSdkVersion:(no version)) +libslab(minSdkVersion:29) libsonivoxwithoutjet(minSdkVersion:29) libspeexresampler(minSdkVersion:29) -libspin(minSdkVersion:(no version)) +libspin(minSdkVersion:29) libssl(minSdkVersion:29) libstagefright_amrnb_common(minSdkVersion:29) libstagefright_amrnbdec(minSdkVersion:29) @@ -519,13 +537,14 @@ libstagefright_mp3dec_headers(minSdkVersion:29) libstagefright_mpeg2extractor(minSdkVersion:29) libstagefright_mpeg2support(minSdkVersion:29) libstatssocket_headers(minSdkVersion:29) -libstd(minSdkVersion:(no version)) -libstd_detect.rust_sysroot(minSdkVersion:(no version)) +libstd(minSdkVersion:29) +libstd_detect.rust_sysroot(minSdkVersion:29) libsync(minSdkVersion:(no version)) libsystem_headers(minSdkVersion:apex_inherit) libsysutils(minSdkVersion:apex_inherit) -libterm(minSdkVersion:(no version)) -libtest(minSdkVersion:(no version)) +libtcutils(minSdkVersion:30) +libterm(minSdkVersion:29) +libtest(minSdkVersion:29) libtextclassifier(minSdkVersion:(no version)) libtextclassifier(minSdkVersion:30) libtextclassifier-java(minSdkVersion:28) @@ -537,22 +556,22 @@ libtextclassifier_hash_static(minSdkVersion:(no version)) libtflite_kernel_utils(minSdkVersion:(no version)) libtflite_static(minSdkVersion:(no version)) libtflite_static(minSdkVersion:30) -libthiserror(minSdkVersion:(no version)) -libtinyvec(minSdkVersion:(no version)) -libtinyvec_macros(minSdkVersion:(no version)) +libthiserror(minSdkVersion:29) +libtinyvec(minSdkVersion:29) +libtinyvec_macros(minSdkVersion:29) libtinyxml2(minSdkVersion:S) -libtokio(minSdkVersion:(no version)) +libtokio(minSdkVersion:29) libui(minSdkVersion:29) libui-types(minSdkVersion:apex_inherit) libui_headers(minSdkVersion:29) -libunicode_bidi(minSdkVersion:(no version)) -libunicode_normalization(minSdkVersion:(no version)) -libunicode_width.rust_sysroot(minSdkVersion:(no version)) -libuntrusted(minSdkVersion:(no version)) -libunwind.rust_sysroot(minSdkVersion:(no version)) +libunicode_bidi(minSdkVersion:29) +libunicode_normalization(minSdkVersion:29) +libunicode_width.rust_sysroot(minSdkVersion:29) +libuntrusted(minSdkVersion:29) +libunwind.rust_sysroot(minSdkVersion:29) libunwind_llvm(minSdkVersion:apex_inherit) libunwindstack(minSdkVersion:29) -liburl(minSdkVersion:(no version)) +liburl(minSdkVersion:29) libutf(minSdkVersion:(no version)) libutils(minSdkVersion:apex_inherit) libutils_headers(minSdkVersion:apex_inherit) @@ -600,10 +619,13 @@ net-utils-services-common(minSdkVersion:30) 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-V3-java(minSdkVersion:29) netd_aidl_interface-V5-java(minSdkVersion:29) netd_aidl_interface-V6-java(minSdkVersion:29) netd_aidl_interface-V7-java(minSdkVersion:29) +netd_aidl_interface-V8-java(minSdkVersion:29) +netd_aidl_interface-V8-ndk(minSdkVersion:29) netd_event_listener_interface-java(minSdkVersion:29) netd_event_listener_interface-lateststable-java(minSdkVersion:29) netd_event_listener_interface-ndk_platform(minSdkVersion:29) @@ -614,12 +636,13 @@ netlink-client(minSdkVersion:29) networkstack-aidl-interfaces-V10-java(minSdkVersion:29) networkstack-aidl-interfaces-V11-java(minSdkVersion:29) networkstack-aidl-interfaces-V12-java(minSdkVersion:29) +networkstack-aidl-interfaces-V13-java(minSdkVersion:29) networkstack-aidl-latest(minSdkVersion:29) networkstack-client(minSdkVersion:29) NetworkStackApi29Shims(minSdkVersion:29) NetworkStackApi30Shims(minSdkVersion:29) NetworkStackApi31Shims(minSdkVersion:29) -NetworkStackApi32Shims(minSdkVersion:29) +NetworkStackApi33Shims(minSdkVersion:29) NetworkStackApiCurrentShims(minSdkVersion:29) NetworkStackApiStableLib(minSdkVersion:29) NetworkStackApiStableShims(minSdkVersion:29) @@ -695,7 +718,9 @@ prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:(no version)) prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:14) prebuilt_androidx.dynamicanimation_dynamicanimation-nodeps(minSdkVersion:14) prebuilt_androidx.emoji2_emoji-nodeps(minSdkVersion:14) +prebuilt_androidx.emoji2_emoji2-nodeps(minSdkVersion:14) prebuilt_androidx.emoji2_emoji2-views-helpe-nodeps(minSdkVersion:14) +prebuilt_androidx.emoji2_emoji2-views-helper-nodeps(minSdkVersion:14) prebuilt_androidx.exifinterface_exifinterface-nodeps(minSdkVersion:14) prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:(no version)) prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:14) @@ -809,6 +834,7 @@ prebuilt_crtbegin_so(minSdkVersion:(no version)) prebuilt_crtend_android(minSdkVersion:(no version)) prebuilt_crtend_so(minSdkVersion:(no version)) prebuilt_error_prone_annotations(minSdkVersion:(no version)) +prebuilt_error_prone_annotations(minSdkVersion:29) prebuilt_error_prone_annotations(minSdkVersion:current) prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14) prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14) @@ -816,16 +842,19 @@ prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14) prebuilt_glide-prebuilt(minSdkVersion:14) prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29) prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current) +prebuilt_jni_headers(minSdkVersion:(no version)) prebuilt_kotlin-stdlib(minSdkVersion:current) prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:(no version)) prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:current) prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:(no version)) prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:current) prebuilt_libasync_safe(minSdkVersion:(no version)) +prebuilt_libc_headers(minSdkVersion:(no version)) prebuilt_libclang_rt.builtins-aarch64-android(minSdkVersion:(no version)) prebuilt_libclang_rt.builtins-arm-android(minSdkVersion:(no version)) prebuilt_libclang_rt.builtins-i686-android(minSdkVersion:(no version)) prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version)) +prebuilt_libnativehelper_header_only(minSdkVersion:(no version)) prebuilt_libperfetto_client_experimental(minSdkVersion:(no version)) prebuilt_libunwind(minSdkVersion:(no version)) prebuilt_perfetto_trace_protos(minSdkVersion:(no version)) diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh index 6c775923..777940d8 100755 --- a/build/build_unbundled_mainline_module.sh +++ b/build/build_unbundled_mainline_module.sh @@ -44,7 +44,8 @@ readonly -a DEFAULT_MODULES=( com.android.conscrypt com.android.extservices com.android.i18n - com.android.ipsec + # TODO(b/210694291): include ipsec module in the build + # com.android.ipsec com.android.media com.android.mediaprovider com.android.media.swcodec @@ -55,7 +56,8 @@ readonly -a DEFAULT_MODULES=( com.android.runtime com.android.sdkext com.android.telephony - com.android.tethering + # TODO(b/210694291): include tethering module in the build + # com.android.tethering com.android.tzdata com.android.wifi test1_com.android.tzdata @@ -67,7 +69,6 @@ readonly -a DEFAULT_MODULES=( ExtServices NetworkPermissionConfig NetworkStack - NetworkStackNext PermissionController ) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index c6be7d40..ed0f14ad 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -317,7 +317,8 @@ class SdkDistProducer: return os.path.join(self.out_dir, "soong/mainline-sdks", f"{sdk_name}-{sdk_version}.zip") - def produce_dist(self, sdk_versions, modules): + def produce_dist(self, modules): + sdk_versions = SDK_VERSIONS self.build_sdks(sdk_versions, modules) self.populate_dist(sdk_versions, modules) @@ -503,26 +504,30 @@ def apply_transformations(producer, tmp_dir, transformations): os.utime(path, (modified, modified)) -def main(): - """Program entry point.""" - if not os.path.exists("build/make/core/Makefile"): - sys.exit("This script must be run from the top of the tree.") - - producer = SdkDistProducer( +def create_producer(): + return SdkDistProducer( # Variables initialized from environment variables that are set by the # calling mainline_modules_sdks.sh. out_dir=os.environ["OUT_DIR"], dist_dir=os.environ["DIST_DIR"], ) +def filter_modules(modules): target_build_apps = os.environ.get("TARGET_BUILD_APPS") if target_build_apps: - build_mainline_modules = [m for m in MAINLINE_MODULES - if m.apex in target_build_apps.split()] + target_build_apps = target_build_apps.split() + return [m for m in modules if m.apex in target_build_apps] else: - build_mainline_modules = MAINLINE_MODULES + return modules + +def main(): + """Program entry point.""" + if not os.path.exists("build/make/core/Makefile"): + sys.exit("This script must be run from the top of the tree.") - producer.produce_dist(SDK_VERSIONS, build_mainline_modules) + producer = create_producer() + modules = filter_modules(MAINLINE_MODULES) + producer.produce_dist(modules) if __name__ == "__main__": diff --git a/build/mainline_modules_sdks.sh b/build/mainline_modules_sdks.sh index 2cf17f3f..4e251612 100755 --- a/build/mainline_modules_sdks.sh +++ b/build/mainline_modules_sdks.sh @@ -15,6 +15,27 @@ # limitations under the License. # +function init() { + declare -ga ARGV + while (($# > 0)); do + case $1 in + --py3script) + declare -gr py3script="$2" + shift 2 + ;; + *) + ARGV+=("$1") + shift 1 + ;; + esac + done + readonly ARGV + + if [ -z "${py3script}" ]; then + declare -gr py3script="packages/modules/common/build/mainline_modules_sdks.py" + fi +} + function main() { if [ ! -e "build/make/core/Makefile" ]; then echo "$0 must be run from the top of the tree" @@ -34,7 +55,11 @@ function main() { # Delegate the SDK generation to the python script. Use the python version # provided by the build to ensure consistency across build environments. export DIST_DIR OUT_DIR - prebuilts/build-tools/linux-x86/bin/py3-cmd packages/modules/common/build/mainline_modules_sdks.py "$@" + + prebuilts/build-tools/linux-x86/bin/py3-cmd "${py3script}" } -main "${@}" +init "$@" +# The wacky ${foo[@]+"${foo[@]}"}, makes bash correctly pass nothing when an +# array is empty (necessary prior to bash 4.4). +main ${ARGV[@]+"${ARGV[@]}"} diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py index 8a54ab8e..57601361 100644 --- a/build/mainline_modules_sdks_test.py +++ b/build/mainline_modules_sdks_test.py @@ -162,5 +162,18 @@ class TestSoongConfigBoilerplateInserter(unittest.TestCase): self.apply_transformations(src, transformations, expected) +class TestFilterModules(unittest.TestCase): + + def test_no_filter(self): + modules = mm.filter_modules(mm.MAINLINE_MODULES) + self.assertEqual(modules, mm.MAINLINE_MODULES) + + def test_with_filter(self): + os.environ["TARGET_BUILD_APPS"] = "com.android.art" + modules = mm.filter_modules(mm.MAINLINE_MODULES) + expected = mm.MAINLINE_MODULES_BY_APEX["com.android.art"] + self.assertEqual(modules, [expected]) + + if __name__ == "__main__": unittest.main(verbosity=2) diff --git a/proto/classpaths.proto b/proto/classpaths.proto index 829c14ca..97f288e9 100644 --- a/proto/classpaths.proto +++ b/proto/classpaths.proto @@ -21,6 +21,7 @@ enum Classpath { BOOTCLASSPATH = 1; SYSTEMSERVERCLASSPATH = 2; DEX2OATBOOTCLASSPATH = 3; + STANDALONE_SYSTEMSERVER_JARS = 4; } // Individual entry in a classpath variable. diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index e89d676e..4f9cec99 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -155,8 +155,8 @@ java_defaults { ":__subpackages__", "//frameworks/base/apex:__subpackages__", "//frameworks/base/libs/hwui", - // TODO: remove after moving connectivity to packages/modules - "//frameworks/base/packages/Connectivity:__subpackages__", + // TODO(b/208914639): remove after moving files to packages/modules/Connectivity + "//frameworks/base/packages/ConnectivityT:__subpackages__", "//frameworks/base/wifi", "//packages/modules:__subpackages__", "//packages/providers/MediaProvider:__subpackages__", @@ -202,7 +202,7 @@ stubs_defaults { }, }, dist: { - targets: ["sdk", "win_sdk"], + targets: ["sdk"], dir: "apistubs/android/system-server/api", }, } @@ -212,7 +212,7 @@ stubs_defaults { java_defaults { name: "service-module-stubs-defaults", dist: { - targets: ["sdk", "win_sdk"], + targets: ["sdk"], dir: "apistubs/android/system-server", }, } |