diff options
| -rw-r--r-- | build/allowed_deps.txt | 127 | ||||
| -rw-r--r-- | sdk/ModuleDefaults.bp | 23 |
2 files changed, 66 insertions, 84 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 5e99002e..5ff474a2 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -43,6 +43,7 @@ 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-V4-ndk(minSdkVersion:30) android.hardware.neuralnetworks@1.0(minSdkVersion:30) android.hardware.neuralnetworks@1.1(minSdkVersion:30) android.hardware.neuralnetworks@1.2(minSdkVersion:30) @@ -57,6 +58,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) @@ -265,11 +267,11 @@ 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) @@ -288,10 +290,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) @@ -301,7 +303,7 @@ libbluetooth-types-header(minSdkVersion:29) libbrotli(minSdkVersion:(no version)) libbuildversion(minSdkVersion:(no version)) libbuildversion(minSdkVersion:26) -libbytes(minSdkVersion:(no version)) +libbytes(minSdkVersion:29) libc++(minSdkVersion:apex_inherit) libc++_static(minSdkVersion:apex_inherit) libc++abi(minSdkVersion:apex_inherit) @@ -312,8 +314,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) @@ -353,8 +355,8 @@ libcodec2_soft_vp9dec(minSdkVersion:29) libcodec2_soft_vp9enc(minSdkVersion:29) libcodec2_vndk(minSdkVersion:29) libcom_android_networkstack_tethering_util_jni(minSdkVersion:30) -libcompiler_builtins.rust_sysroot(minSdkVersion:(no version)) -libcore.rust_sysroot(minSdkVersion:(no version)) +libcompiler_builtins.rust_sysroot(minSdkVersion:29) +libcore.rust_sysroot(minSdkVersion:29) libcrypto(minSdkVersion:29) libcrypto_static(minSdkVersion:(no version)) libcrypto_utils(minSdkVersion:(no version)) @@ -368,9 +370,9 @@ 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) @@ -382,21 +384,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) @@ -406,32 +408,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)) @@ -441,7 +443,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)) @@ -449,7 +451,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) @@ -470,18 +472,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) @@ -491,25 +493,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) @@ -536,13 +538,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) @@ -554,22 +557,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) @@ -617,11 +620,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) diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp index 4f9cec99..9f399895 100644 --- a/sdk/ModuleDefaults.bp +++ b/sdk/ModuleDefaults.bp @@ -19,34 +19,11 @@ package { mainline_stubs_args = "--error UnhiddenSystemApi " + - "--hide BroadcastBehavior " + "--hide CallbackInterface " + - "--hide DeprecationMismatch " + - "--hide HiddenSuperclass " + "--hide HiddenTypedefConstant " + - "--hide HiddenTypeParameter " + - "--hide MissingPermission " + "--hide RequiresPermission " + - "--hide SdkConstant " + - "--hide Todo " + - "--hide Typo " + - "--hide UnavailableSymbol " + "--enhance-documentation " -// TODO: modularize this so not every module has the same list -framework_packages_to_document = [ - "android", - "dalvik", - "java", - "javax", - "junit", - "org.apache.http", - "org.json", - "org.w3c.dom", - "org.xml.sax", - "org.xmlpull", -] - // TODO: remove the hiding when server classes are cleaned up. mainline_framework_stubs_args = mainline_stubs_args + |