diff --git a/apex/OWNERS b/apex/OWNERS index fee739b56..8e4ba5cd5 100644 --- a/apex/OWNERS +++ b/apex/OWNERS @@ -1,4 +1 @@ per-file * = jiyong@google.com - -per-file allowed_deps.txt = set noparent -per-file allowed_deps.txt = dariofreni@google.com,hansson@google.com,harpin@google.com,jiyong@google.com,narayan@google.com,jham@google.com diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt deleted file mode 100644 index 154b9aa67..000000000 --- a/apex/allowed_deps.txt +++ /dev/null @@ -1,652 +0,0 @@ -# A list of allowed dependencies for all updatable modules. -# -# The list tracks all direct and transitive dependencies that end up within any -# of the updatable binaries; specifically excluding external dependencies -# required to compile those binaries. This prevents potential regressions in -# case a new dependency is not aware of the different functional and -# non-functional requirements being part of an updatable module, for example -# setting correct min_sdk_version. -# -# To update the list, run: -# repo-root$ build/soong/scripts/update-apex-allowed-deps.sh -# -# See go/apex-allowed-deps-error for more details. -# TODO(b/157465465): introduce automated quality signals and remove this list. - -adbd(minSdkVersion:(no version)) -android.hardware.cas.native@1.0(minSdkVersion:29) -android.hardware.cas@1.0(minSdkVersion:29) -android.hardware.common-ndk_platform(minSdkVersion:29) -android.hardware.common-unstable-ndk_platform(minSdkVersion:29) -android.hardware.common-V2-ndk_platform(minSdkVersion:29) -android.hardware.graphics.allocator@2.0(minSdkVersion:29) -android.hardware.graphics.allocator@3.0(minSdkVersion:29) -android.hardware.graphics.allocator@4.0(minSdkVersion:29) -android.hardware.graphics.bufferqueue@1.0(minSdkVersion:29) -android.hardware.graphics.bufferqueue@2.0(minSdkVersion:29) -android.hardware.graphics.common-ndk_platform(minSdkVersion:29) -android.hardware.graphics.common-unstable-ndk_platform(minSdkVersion:29) -android.hardware.graphics.common-V2-ndk_platform(minSdkVersion:29) -android.hardware.graphics.common@1.0(minSdkVersion:29) -android.hardware.graphics.common@1.1(minSdkVersion:29) -android.hardware.graphics.common@1.2(minSdkVersion:29) -android.hardware.graphics.mapper@2.0(minSdkVersion:29) -android.hardware.graphics.mapper@2.1(minSdkVersion:29) -android.hardware.graphics.mapper@3.0(minSdkVersion:29) -android.hardware.graphics.mapper@4.0(minSdkVersion:29) -android.hardware.media.bufferpool@2.0(minSdkVersion:29) -android.hardware.media.c2@1.0(minSdkVersion:29) -android.hardware.media.c2@1.1(minSdkVersion:29) -android.hardware.media.omx@1.0(minSdkVersion:29) -android.hardware.media@1.0(minSdkVersion:29) -android.hardware.neuralnetworks-V1-ndk_platform(minSdkVersion:30) -android.hardware.neuralnetworks@1.0(minSdkVersion:30) -android.hardware.neuralnetworks@1.1(minSdkVersion:30) -android.hardware.neuralnetworks@1.2(minSdkVersion:30) -android.hardware.neuralnetworks@1.3(minSdkVersion:30) -android.hardware.tetheroffload.config-V1.0-java(minSdkVersion:current) -android.hardware.tetheroffload.control-V1.0-java(minSdkVersion:current) -android.hidl.allocator@1.0(minSdkVersion:29) -android.hidl.base-V1.0-java(minSdkVersion:current) -android.hidl.memory.token@1.0(minSdkVersion:29) -android.hidl.memory@1.0(minSdkVersion:29) -android.hidl.safe_union@1.0(minSdkVersion:29) -android.hidl.token@1.0(minSdkVersion:29) -android.hidl.token@1.0-utils(minSdkVersion:29) -android.net.ipsec.ike(minSdkVersion:30) -android.net.ipsec.ike(minSdkVersion:current) -android.net.ipsec.ike.xml(minSdkVersion:(no version)) -androidx-constraintlayout_constraintlayout(minSdkVersion:14) -androidx-constraintlayout_constraintlayout-solver(minSdkVersion:24) -androidx.activity_activity(minSdkVersion:14) -androidx.activity_activity-ktx(minSdkVersion:14) -androidx.annotation_annotation(minSdkVersion:24) -androidx.annotation_annotation(minSdkVersion:current) -androidx.appcompat_appcompat(minSdkVersion:14) -androidx.appcompat_appcompat-resources(minSdkVersion:14) -androidx.arch.core_core-common(minSdkVersion:24) -androidx.arch.core_core-common(minSdkVersion:current) -androidx.arch.core_core-runtime(minSdkVersion:14) -androidx.asynclayoutinflater_asynclayoutinflater(minSdkVersion:14) -androidx.autofill_autofill(minSdkVersion:14) -androidx.cardview_cardview(minSdkVersion:14) -androidx.collection_collection(minSdkVersion:24) -androidx.collection_collection(minSdkVersion:current) -androidx.collection_collection-ktx(minSdkVersion:24) -androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:14) -androidx.core_core(minSdkVersion:14) -androidx.core_core-ktx(minSdkVersion:14) -androidx.cursoradapter_cursoradapter(minSdkVersion:14) -androidx.customview_customview(minSdkVersion:14) -androidx.documentfile_documentfile(minSdkVersion:14) -androidx.drawerlayout_drawerlayout(minSdkVersion:14) -androidx.dynamicanimation_dynamicanimation(minSdkVersion:14) -androidx.fragment_fragment(minSdkVersion:14) -androidx.fragment_fragment-ktx(minSdkVersion:14) -androidx.interpolator_interpolator(minSdkVersion:14) -androidx.leanback_leanback(minSdkVersion:17) -androidx.leanback_leanback-preference(minSdkVersion:21) -androidx.legacy_legacy-preference-v14(minSdkVersion:14) -androidx.legacy_legacy-support-core-ui(minSdkVersion:14) -androidx.legacy_legacy-support-core-utils(minSdkVersion:14) -androidx.legacy_legacy-support-v13(minSdkVersion:14) -androidx.legacy_legacy-support-v4(minSdkVersion:14) -androidx.lifecycle_lifecycle-common(minSdkVersion:24) -androidx.lifecycle_lifecycle-common(minSdkVersion:current) -androidx.lifecycle_lifecycle-common-java8(minSdkVersion:24) -androidx.lifecycle_lifecycle-extensions(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata-core(minSdkVersion:14) -androidx.lifecycle_lifecycle-livedata-core-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-process(minSdkVersion:14) -androidx.lifecycle_lifecycle-runtime(minSdkVersion:14) -androidx.lifecycle_lifecycle-runtime-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-service(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel-ktx(minSdkVersion:14) -androidx.lifecycle_lifecycle-viewmodel-savedstate(minSdkVersion:14) -androidx.loader_loader(minSdkVersion:14) -androidx.localbroadcastmanager_localbroadcastmanager(minSdkVersion:14) -androidx.media_media(minSdkVersion:14) -androidx.navigation_navigation-common(minSdkVersion:14) -androidx.navigation_navigation-common-ktx(minSdkVersion:14) -androidx.navigation_navigation-fragment(minSdkVersion:14) -androidx.navigation_navigation-fragment-ktx(minSdkVersion:14) -androidx.navigation_navigation-runtime(minSdkVersion:14) -androidx.navigation_navigation-runtime-ktx(minSdkVersion:14) -androidx.navigation_navigation-ui(minSdkVersion:14) -androidx.navigation_navigation-ui-ktx(minSdkVersion:14) -androidx.preference_preference(minSdkVersion:14) -androidx.print_print(minSdkVersion:14) -androidx.recyclerview_recyclerview(minSdkVersion:14) -androidx.recyclerview_recyclerview-selection(minSdkVersion:14) -androidx.savedstate_savedstate(minSdkVersion:14) -androidx.slidingpanelayout_slidingpanelayout(minSdkVersion:14) -androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:14) -androidx.transition_transition(minSdkVersion:14) -androidx.vectordrawable_vectordrawable(minSdkVersion:14) -androidx.vectordrawable_vectordrawable-animated(minSdkVersion:14) -androidx.versionedparcelable_versionedparcelable(minSdkVersion:14) -androidx.viewpager_viewpager(minSdkVersion:14) -apache-commons-compress(minSdkVersion:current) -art.module.public.api.stubs(minSdkVersion:(no version)) -bcm_object(minSdkVersion:29) -bionic_libc_platform_headers(minSdkVersion:29) -boringssl_self_test(minSdkVersion:29) -bouncycastle_ike_digests(minSdkVersion:current) -bpf_syscall_wrappers(minSdkVersion:30) -brotli-java(minSdkVersion:current) -captiveportal-lib(minSdkVersion:29) -car-ui-lib(minSdkVersion:28) -car-ui-lib-overlayable(minSdkVersion:28) -CellBroadcastApp(minSdkVersion:29) -CellBroadcastServiceModule(minSdkVersion:29) -codecs_g711dec(minSdkVersion:29) -com.google.android.material_material(minSdkVersion:14) -conscrypt(minSdkVersion:29) -conscrypt.module.platform.api.stubs(minSdkVersion:(no version)) -conscrypt.module.public.api.stubs(minSdkVersion:(no version)) -core-lambda-stubs(minSdkVersion:(no version)) -core.current.stubs(minSdkVersion:(no version)) -crtbegin_dynamic(minSdkVersion:16) -crtbegin_dynamic(minSdkVersion:apex_inherit) -crtbegin_dynamic1(minSdkVersion:16) -crtbegin_dynamic1(minSdkVersion:apex_inherit) -crtbegin_so(minSdkVersion:16) -crtbegin_so(minSdkVersion:apex_inherit) -crtbegin_so1(minSdkVersion:16) -crtbegin_so1(minSdkVersion:apex_inherit) -crtbrand(minSdkVersion:16) -crtbrand(minSdkVersion:apex_inherit) -crtend_android(minSdkVersion:16) -crtend_android(minSdkVersion:apex_inherit) -crtend_so(minSdkVersion:16) -crtend_so(minSdkVersion:apex_inherit) -datastallprotosnano(minSdkVersion:29) -derive_classpath(minSdkVersion:30) -derive_sdk(minSdkVersion:30) -derive_sdk(minSdkVersion:current) -derive_sdk_prefer32(minSdkVersion:30) -derive_sdk_prefer32(minSdkVersion:current) -dnsresolver_aidl_interface-lateststable-ndk_platform(minSdkVersion:29) -dnsresolver_aidl_interface-unstable-ndk_platform(minSdkVersion:29) -dnsresolver_aidl_interface-V7-ndk_platform(minSdkVersion:29) -dnsresolver_aidl_interface-V8-ndk_platform(minSdkVersion:29) -DocumentsUI-res-lib(minSdkVersion:29) -exoplayer2-extractor(minSdkVersion:16) -exoplayer2-extractor-annotation-stubs(minSdkVersion:16) -ExtServices(minSdkVersion:current) -ExtServices-core(minSdkVersion:current) -flatbuffer_headers(minSdkVersion:(no version)) -fmtlib(minSdkVersion:29) -fmtlib_ndk(minSdkVersion:29) -framework-mediaprovider(minSdkVersion:30) -framework-permission(minSdkVersion:30) -framework-permission(minSdkVersion:current) -framework-permission-s(minSdkVersion:30) -framework-permission-s-shared(minSdkVersion:30) -framework-sdkextensions(minSdkVersion:30) -framework-sdkextensions(minSdkVersion:current) -framework-statsd(minSdkVersion:30) -framework-statsd(minSdkVersion:current) -framework-tethering(minSdkVersion:30) -framework-tethering(minSdkVersion:current) -gemmlowp_headers(minSdkVersion:(no version)) -GoogleCellBroadcastApp(minSdkVersion:29) -GoogleCellBroadcastServiceModule(minSdkVersion:29) -GoogleExtServices(minSdkVersion:current) -GooglePermissionController(minSdkVersion:30) -guava(minSdkVersion:current) -gwp_asan_headers(minSdkVersion:(no version)) -i18n.module.public.api.stubs(minSdkVersion:(no version)) -iconloader(minSdkVersion:21) -ike-internals(minSdkVersion:current) -InProcessTethering(minSdkVersion:30) -InProcessTethering(minSdkVersion:current) -ipmemorystore-aidl-interfaces-java(minSdkVersion:29) -ipmemorystore-aidl-interfaces-unstable-java(minSdkVersion:29) -ipmemorystore-aidl-interfaces-V10-java(minSdkVersion:29) -ipmemorystore-aidl-interfaces-V11-java(minSdkVersion:29) -jni_headers(minSdkVersion:29) -jsr305(minSdkVersion:14) -kotlinx-coroutines-android(minSdkVersion:current) -kotlinx-coroutines-core(minSdkVersion:current) -legacy.art.module.platform.api.stubs(minSdkVersion:(no version)) -legacy.core.platform.api.stubs(minSdkVersion:(no version)) -legacy.i18n.module.platform.api.stubs(minSdkVersion:(no version)) -libaacextractor(minSdkVersion:29) -libadb_crypto(minSdkVersion:(no version)) -libadb_pairing_auth(minSdkVersion:(no version)) -libadb_pairing_connection(minSdkVersion:(no version)) -libadb_pairing_server(minSdkVersion:(no version)) -libadb_protos(minSdkVersion:(no version)) -libadb_sysdeps(minSdkVersion:apex_inherit) -libadb_tls_connection(minSdkVersion:(no version)) -libadbconnection_client(minSdkVersion:(no version)) -libadbconnection_server(minSdkVersion:(no version)) -libadbd(minSdkVersion:(no version)) -libadbd_core(minSdkVersion:(no version)) -libadbd_services(minSdkVersion:(no version)) -liballoc.rust_sysroot(minSdkVersion:29) -libamrextractor(minSdkVersion:29) -libapp_processes_protos_lite(minSdkVersion:(no version)) -libarect(minSdkVersion:29) -libasyncio(minSdkVersion:(no version)) -libatomic(minSdkVersion:(no version)) -libaudio_system_headers(minSdkVersion:29) -libaudioclient_headers(minSdkVersion:29) -libaudiofoundation_headers(minSdkVersion:29) -libaudioutils(minSdkVersion:29) -libaudioutils_fixedfft(minSdkVersion:29) -libavcdec(minSdkVersion:29) -libavcenc(minSdkVersion:29) -libavservices_minijail(minSdkVersion:29) -libbacktrace_headers(minSdkVersion:apex_inherit) -libbacktrace_rs.rust_sysroot(minSdkVersion:29) -libbacktrace_sys.rust_sysroot(minSdkVersion:29) -libbase(minSdkVersion:29) -libbase_headers(minSdkVersion:29) -libbase_ndk(minSdkVersion:29) -libbinder_headers(minSdkVersion:29) -libbinder_headers_platform_shared(minSdkVersion:29) -libbinderthreadstateutils(minSdkVersion:29) -libbluetooth-types-header(minSdkVersion:29) -libbrotli(minSdkVersion:(no version)) -libbuildversion(minSdkVersion:(no version)) -libc(minSdkVersion:(no version)) -libc++(minSdkVersion:apex_inherit) -libc++_static(minSdkVersion:apex_inherit) -libc++abi(minSdkVersion:apex_inherit) -libc++demangle(minSdkVersion:apex_inherit) -libc_headers(minSdkVersion:apex_inherit) -libc_headers_arch(minSdkVersion:apex_inherit) -libcap(minSdkVersion:29) -libcfg_if(minSdkVersion:29) -libcfg_if.rust_sysroot(minSdkVersion:29) -libclang_rt.hwasan-aarch64-android.llndk(minSdkVersion:(no version)) -libcodec2(minSdkVersion:29) -libcodec2_headers(minSdkVersion:29) -libcodec2_hidl@1.0(minSdkVersion:29) -libcodec2_hidl@1.1(minSdkVersion:29) -libcodec2_internal(minSdkVersion:29) -libcodec2_soft_aacdec(minSdkVersion:29) -libcodec2_soft_aacenc(minSdkVersion:29) -libcodec2_soft_amrnbdec(minSdkVersion:29) -libcodec2_soft_amrnbenc(minSdkVersion:29) -libcodec2_soft_amrwbdec(minSdkVersion:29) -libcodec2_soft_amrwbenc(minSdkVersion:29) -libcodec2_soft_av1dec_gav1(minSdkVersion:29) -libcodec2_soft_avcdec(minSdkVersion:29) -libcodec2_soft_avcenc(minSdkVersion:29) -libcodec2_soft_common(minSdkVersion:29) -libcodec2_soft_flacdec(minSdkVersion:29) -libcodec2_soft_flacenc(minSdkVersion:29) -libcodec2_soft_g711alawdec(minSdkVersion:29) -libcodec2_soft_g711mlawdec(minSdkVersion:29) -libcodec2_soft_gsmdec(minSdkVersion:29) -libcodec2_soft_h263dec(minSdkVersion:29) -libcodec2_soft_h263enc(minSdkVersion:29) -libcodec2_soft_hevcdec(minSdkVersion:29) -libcodec2_soft_hevcenc(minSdkVersion:29) -libcodec2_soft_mp3dec(minSdkVersion:29) -libcodec2_soft_mpeg2dec(minSdkVersion:29) -libcodec2_soft_mpeg4dec(minSdkVersion:29) -libcodec2_soft_mpeg4enc(minSdkVersion:29) -libcodec2_soft_opusdec(minSdkVersion:29) -libcodec2_soft_opusenc(minSdkVersion:29) -libcodec2_soft_rawdec(minSdkVersion:29) -libcodec2_soft_vorbisdec(minSdkVersion:29) -libcodec2_soft_vp8dec(minSdkVersion:29) -libcodec2_soft_vp8enc(minSdkVersion:29) -libcodec2_soft_vp9dec(minSdkVersion:29) -libcodec2_soft_vp9enc(minSdkVersion:29) -libcodec2_vndk(minSdkVersion:29) -libcompiler_builtins.rust_sysroot(minSdkVersion:29) -libcore.rust_sysroot(minSdkVersion:29) -libcrypto(minSdkVersion:29) -libcrypto_static(minSdkVersion:(no version)) -libcrypto_utils(minSdkVersion:(no version)) -libcutils(minSdkVersion:29) -libcutils_headers(minSdkVersion:29) -libcutils_sockets(minSdkVersion:29) -libderive_classpath(minSdkVersion:30) -libderive_sdk(minSdkVersion:30) -libdiagnose_usb(minSdkVersion:(no version)) -libdl(minSdkVersion:(no version)) -libdmabufheap(minSdkVersion:29) -libeigen(minSdkVersion:(no version)) -libfifo(minSdkVersion:29) -libFLAC(minSdkVersion:29) -libFLAC-config(minSdkVersion:29) -libFLAC-headers(minSdkVersion:29) -libflacextractor(minSdkVersion:29) -libfmq(minSdkVersion:29) -libfmq-base(minSdkVersion:29) -libFraunhoferAAC(minSdkVersion:29) -libfuse(minSdkVersion:30) -libfuse_jni(minSdkVersion:30) -libgav1(minSdkVersion:29) -libgcc(minSdkVersion:(no version)) -libgcc_stripped(minSdkVersion:(no version)) -libgetopts(minSdkVersion:29) -libgralloctypes(minSdkVersion:29) -libgrallocusage(minSdkVersion:29) -libgsm(minSdkVersion:apex_inherit) -libgtest_prod(minSdkVersion:apex_inherit) -libgui_bufferqueue_static(minSdkVersion:29) -libgui_headers(minSdkVersion:29) -libhardware(minSdkVersion:29) -libhardware_headers(minSdkVersion:29) -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) -libion(minSdkVersion:29) -libjavacrypto(minSdkVersion:29) -libjsoncpp(minSdkVersion:29) -liblazy_static(minSdkVersion:29) -liblibc(minSdkVersion:29) -liblibc.rust_sysroot(minSdkVersion:29) -libLibGuiProperties(minSdkVersion:29) -liblibm(minSdkVersion:29) -liblog(minSdkVersion:(no version)) -liblog_headers(minSdkVersion:29) -liblog_rust(minSdkVersion:29) -liblua(minSdkVersion:(no version)) -liblz4(minSdkVersion:(no version)) -libm(minSdkVersion:(no version)) -libmath(minSdkVersion:29) -libmdnssd(minSdkVersion:(no version)) -libmedia_codecserviceregistrant(minSdkVersion:29) -libmedia_datasource_headers(minSdkVersion:29) -libmedia_headers(minSdkVersion:29) -libmedia_helper_headers(minSdkVersion:29) -libmedia_midiiowrapper(minSdkVersion:29) -libmediaparser-jni(minSdkVersion:29) -libmidiextractor(minSdkVersion:29) -libminijail(minSdkVersion:29) -libminijail_gen_constants(minSdkVersion:(no version)) -libminijail_gen_constants_obj(minSdkVersion:29) -libminijail_gen_syscall(minSdkVersion:(no version)) -libminijail_gen_syscall_obj(minSdkVersion:29) -libminijail_generated(minSdkVersion:29) -libmkvextractor(minSdkVersion:29) -libmodules-utils-build(minSdkVersion:29) -libmp3extractor(minSdkVersion:29) -libmp4extractor(minSdkVersion:29) -libmpeg2dec(minSdkVersion:29) -libmpeg2extractor(minSdkVersion:29) -libnativebase_headers(minSdkVersion:29) -libnativehelper_compat_libc++(minSdkVersion:(no version)) -libnativehelper_header_only(minSdkVersion:29) -libnativewindow_headers(minSdkVersion:29) -libnetd_resolv(minSdkVersion:29) -libnetdbinder_utils_headers(minSdkVersion:29) -libnetdutils(minSdkVersion:29) -libnetjniutils(minSdkVersion:29) -libnetworkstackutilsjni(minSdkVersion:29) -libneuralnetworks(minSdkVersion:(no version)) -libneuralnetworks_common(minSdkVersion:(no version)) -libneuralnetworks_headers(minSdkVersion:(no version)) -liboggextractor(minSdkVersion:29) -libonce_cell(minSdkVersion:29) -libopus(minSdkVersion:29) -libpanic_unwind.rust_sysroot(minSdkVersion:29) -libprocessgroup(minSdkVersion:29) -libprocessgroup_headers(minSdkVersion:29) -libprocpartition(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_ffi(minSdkVersion:29) -libring(minSdkVersion:29) -libring-core(minSdkVersion:29) -librustc_demangle.rust_sysroot(minSdkVersion:29) -libruy_static(minSdkVersion:30) -libsdk_proto(minSdkVersion:30) -libsfplugin_ccodec_utils(minSdkVersion:29) -libsonivoxwithoutjet(minSdkVersion:29) -libspeexresampler(minSdkVersion:29) -libspin(minSdkVersion:29) -libssl(minSdkVersion:29) -libstagefright_amrnb_common(minSdkVersion:29) -libstagefright_amrnbdec(minSdkVersion:29) -libstagefright_amrnbenc(minSdkVersion:29) -libstagefright_amrwbdec(minSdkVersion:29) -libstagefright_amrwbenc(minSdkVersion:29) -libstagefright_bufferpool@2.0.1(minSdkVersion:29) -libstagefright_bufferqueue_helper(minSdkVersion:29) -libstagefright_enc_common(minSdkVersion:29) -libstagefright_esds(minSdkVersion:29) -libstagefright_flacdec(minSdkVersion:29) -libstagefright_foundation(minSdkVersion:29) -libstagefright_foundation_headers(minSdkVersion:29) -libstagefright_foundation_without_imemory(minSdkVersion:29) -libstagefright_headers(minSdkVersion:29) -libstagefright_id3(minSdkVersion:29) -libstagefright_m4vh263dec(minSdkVersion:29) -libstagefright_m4vh263enc(minSdkVersion:29) -libstagefright_metadatautils(minSdkVersion:29) -libstagefright_mp3dec(minSdkVersion:29) -libstagefright_mp3dec_headers(minSdkVersion:29) -libstagefright_mpeg2extractor(minSdkVersion:29) -libstagefright_mpeg2support_nocrypto(minSdkVersion:29) -libstats_jni(minSdkVersion:(no version)) -libstats_jni(minSdkVersion:30) -libstatslog_resolv(minSdkVersion:29) -libstatslog_statsd(minSdkVersion:(no version)) -libstatslog_statsd(minSdkVersion:30) -libstatspull(minSdkVersion:(no version)) -libstatspull(minSdkVersion:30) -libstatspush_compat(minSdkVersion:29) -libstatssocket(minSdkVersion:(no version)) -libstatssocket(minSdkVersion:30) -libstatssocket_headers(minSdkVersion:29) -libstd(minSdkVersion:29) -libsystem_headers(minSdkVersion:apex_inherit) -libsysutils(minSdkVersion:apex_inherit) -libterm(minSdkVersion:29) -libtest(minSdkVersion:29) -libtetherutilsjni(minSdkVersion:30) -libtetherutilsjni(minSdkVersion:current) -libtextclassifier(minSdkVersion:(no version)) -libtextclassifier-java(minSdkVersion:current) -libtextclassifier_hash_headers(minSdkVersion:(no version)) -libtextclassifier_hash_static(minSdkVersion:(no version)) -libtflite_kernel_utils(minSdkVersion:(no version)) -libtflite_static(minSdkVersion:(no version)) -libui(minSdkVersion:29) -libui_headers(minSdkVersion:29) -libunicode_width.rust_sysroot(minSdkVersion:29) -libuntrusted(minSdkVersion:29) -libunwind.rust_sysroot(minSdkVersion:29) -libunwind_llvm(minSdkVersion:apex_inherit) -libutf(minSdkVersion:(no version)) -libutils(minSdkVersion:apex_inherit) -libutils_headers(minSdkVersion:apex_inherit) -libvorbisidec(minSdkVersion:29) -libvpx(minSdkVersion:29) -libwatchdog(minSdkVersion:29) -libwavextractor(minSdkVersion:29) -libwebm(minSdkVersion:29) -libyuv(minSdkVersion:29) -libyuv_static(minSdkVersion:29) -libzstd(minSdkVersion:(no version)) -media_ndk_headers(minSdkVersion:29) -media_plugin_headers(minSdkVersion:29) -MediaProvider(minSdkVersion:30) -mediaswcodec(minSdkVersion:29) -metrics-constants-protos(minSdkVersion:29) -modules-annotation-minsdk(minSdkVersion:29) -modules-utils-build(minSdkVersion:29) -modules-utils-build_system(minSdkVersion:29) -modules-utils-os(minSdkVersion:30) -ndk_crtbegin_so.19(minSdkVersion:(no version)) -ndk_crtbegin_so.21(minSdkVersion:(no version)) -ndk_crtbegin_so.27(minSdkVersion:(no version)) -ndk_crtend_so.19(minSdkVersion:(no version)) -ndk_crtend_so.21(minSdkVersion:(no version)) -ndk_crtend_so.27(minSdkVersion:(no version)) -ndk_libc++_static(minSdkVersion:(no version)) -ndk_libc++_static(minSdkVersion:16) -ndk_libc++abi(minSdkVersion:(no version)) -ndk_libc++abi(minSdkVersion:16) -ndk_libunwind(minSdkVersion:16) -net-utils-device-common(minSdkVersion:29) -net-utils-framework-common(minSdkVersion:current) -netd-client(minSdkVersion:29) -netd_aidl_interface-java(minSdkVersion:29) -netd_aidl_interface-lateststable-java(minSdkVersion:29) -netd_aidl_interface-unstable-java(minSdkVersion:29) -netd_aidl_interface-V5-java(minSdkVersion:29) -netd_aidl_interface-V6-java(minSdkVersion:29) -netd_event_listener_interface-java(minSdkVersion:29) -netd_event_listener_interface-lateststable-ndk_platform(minSdkVersion:29) -netd_event_listener_interface-ndk_platform(minSdkVersion:29) -netd_event_listener_interface-unstable-ndk_platform(minSdkVersion:29) -netd_event_listener_interface-V1-ndk_platform(minSdkVersion:29) -netd_event_listener_interface-V2-ndk_platform(minSdkVersion:29) -netlink-client(minSdkVersion:29) -networkstack-aidl-interfaces-unstable-java(minSdkVersion:29) -networkstack-aidl-interfaces-V10-java(minSdkVersion:29) -networkstack-client(minSdkVersion:29) -NetworkStackApi29Shims(minSdkVersion:29) -NetworkStackApi30Shims(minSdkVersion:29) -NetworkStackApiStableDependencies(minSdkVersion:29) -NetworkStackApiStableLib(minSdkVersion:29) -NetworkStackApiStableShims(minSdkVersion:29) -networkstackprotos(minSdkVersion:29) -NetworkStackShimsCommon(minSdkVersion:29) -neuralnetworks_types(minSdkVersion:30) -neuralnetworks_utils_hal_1_0(minSdkVersion:30) -neuralnetworks_utils_hal_1_1(minSdkVersion:30) -neuralnetworks_utils_hal_1_2(minSdkVersion:30) -neuralnetworks_utils_hal_1_3(minSdkVersion:30) -neuralnetworks_utils_hal_aidl(minSdkVersion:30) -neuralnetworks_utils_hal_common(minSdkVersion:30) -neuralnetworks_utils_hal_service(minSdkVersion:30) -no_op(minSdkVersion:current) -note_memtag_heap_async(minSdkVersion:16) -note_memtag_heap_sync(minSdkVersion:16) -PermissionController(minSdkVersion:30) -permissioncontroller-statsd(minSdkVersion:current) -philox_random(minSdkVersion:(no version)) -philox_random_headers(minSdkVersion:(no version)) -prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:current) -prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.activity_activity-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:current) -prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:current) -prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.asynclayoutinflater_asynclayoutinflater-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.autofill_autofill-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current) -prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current) -prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.core_core-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.cursoradapter_cursoradapter-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.customview_customview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.documentfile_documentfile-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.dynamicanimation_dynamicanimation-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.interpolator_interpolator-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.leanback_leanback-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.leanback_leanback-preference-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-core-ui-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-core-utils-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:current) -prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:current) -prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-core-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-livedata-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-process-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-runtime-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-service-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.loader_loader-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.localbroadcastmanager_localbroadcastmanager-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.media_media-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-common-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-common-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-fragment-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-fragment-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-runtime-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-runtime-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-ui-ktx-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.navigation_navigation-ui-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.preference_preference-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.print_print-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.transition_transition-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.vectordrawable_vectordrawable-animated-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.vectordrawable_vectordrawable-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:(no version)) -prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version)) -prebuilt_com.google.android.material_material-nodeps(minSdkVersion:(no version)) -prebuilt_error_prone_annotations(minSdkVersion:(no version)) -prebuilt_kotlin-stdlib(minSdkVersion:current) -prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:(no version)) -prebuilt_kotlinx-coroutines-core-nodeps(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_libunwind(minSdkVersion:(no version)) -prebuilt_test_framework-sdkextensions(minSdkVersion:(no version)) -server_configurable_flags(minSdkVersion:29) -service-media-s(minSdkVersion:29) -service-permission(minSdkVersion:30) -service-permission(minSdkVersion:current) -service-permission-shared(minSdkVersion:30) -service-statsd(minSdkVersion:30) -service-statsd(minSdkVersion:current) -SettingsLibActionBarShadow(minSdkVersion:21) -SettingsLibAppPreference(minSdkVersion:21) -SettingsLibBarChartPreference(minSdkVersion:21) -SettingsLibHelpUtils(minSdkVersion:21) -SettingsLibLayoutPreference(minSdkVersion:21) -SettingsLibProgressBar(minSdkVersion:21) -SettingsLibRestrictedLockUtils(minSdkVersion:21) -SettingsLibSearchWidget(minSdkVersion:21) -SettingsLibSettingsTheme(minSdkVersion:21) -SettingsLibUtils(minSdkVersion:21) -stats_proto(minSdkVersion:29) -statsd(minSdkVersion:(no version)) -statsd(minSdkVersion:30) -statsd-aidl-ndk_platform(minSdkVersion:(no version)) -statsd-aidl-ndk_platform(minSdkVersion:30) -statsprotos(minSdkVersion:29) -tensorflow_headers(minSdkVersion:(no version)) -Tethering(minSdkVersion:30) -Tethering(minSdkVersion:current) -TetheringApiCurrentLib(minSdkVersion:30) -TetheringApiCurrentLib(minSdkVersion:current) -TetheringGoogle(minSdkVersion:30) -TetheringGoogle(minSdkVersion:current) -textclassifier-statsd(minSdkVersion:current) -TextClassifierNotificationLibNoManifest(minSdkVersion:29) -TextClassifierServiceLibNoManifest(minSdkVersion:28) -updatable-media(minSdkVersion:29) -xz-java(minSdkVersion:current) diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index ee9fc8115..4890ba45e 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -58,8 +58,8 @@ var ( echo "ERROR: go/apex-allowed-deps-error"; echo "******************************"; echo "Detected changes to allowed dependencies in updatable modules."; - echo "To fix and update build/soong/apex/allowed_deps.txt, please run:"; - echo "$$ (croot && build/soong/scripts/update-apex-allowed-deps.sh)"; + echo "To fix and update packages/modules/common/build/allowed_deps.txt, please run:"; + echo "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)"; echo "Members of mainline-modularization@google.com will review the changes."; echo -e "******************************\n"; exit 1; @@ -81,7 +81,7 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex } }) - allowedDeps := android.ExistentPathForSource(ctx, "build/soong/apex/allowed_deps.txt").Path() + allowedDeps := android.ExistentPathForSource(ctx, "packages/modules/common/build/allowed_deps.txt").Path() newAllowedDeps := android.PathForOutput(ctx, "apex", "depsinfo", "new-allowed-deps.txt") ctx.Build(pctx, android.BuildParams{ diff --git a/scripts/update-apex-allowed-deps.sh b/scripts/update-apex-allowed-deps.sh deleted file mode 100755 index 872d74670..000000000 --- a/scripts/update-apex-allowed-deps.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e -# -# The script to run locally to re-generate global allowed list of dependencies -# for updatable modules. - -if [ ! -e "build/envsetup.sh" ]; then - echo "ERROR: $0 must be run from the top of the tree" - exit 1 -fi - -source build/envsetup.sh > /dev/null || exit 1 - -readonly OUT_DIR=$(get_build_var OUT_DIR) - -readonly ALLOWED_DEPS_FILE="build/soong/apex/allowed_deps.txt" -readonly NEW_ALLOWED_DEPS_FILE="${OUT_DIR}/soong/apex/depsinfo/new-allowed-deps.txt" - -# If the script is run after droidcore failure, ${NEW_ALLOWED_DEPS_FILE} -# should already be built. If running the script manually, make sure it exists. -m "${NEW_ALLOWED_DEPS_FILE}" -j - -cat > "${ALLOWED_DEPS_FILE}" << EndOfFileComment -# A list of allowed dependencies for all updatable modules. -# -# The list tracks all direct and transitive dependencies that end up within any -# of the updatable binaries; specifically excluding external dependencies -# required to compile those binaries. This prevents potential regressions in -# case a new dependency is not aware of the different functional and -# non-functional requirements being part of an updatable module, for example -# setting correct min_sdk_version. -# -# To update the list, run: -# repo-root$ build/soong/scripts/update-apex-allowed-deps.sh -# -# See go/apex-allowed-deps-error for more details. -# TODO(b/157465465): introduce automated quality signals and remove this list. -EndOfFileComment - -cat "${NEW_ALLOWED_DEPS_FILE}" >> "${ALLOWED_DEPS_FILE}"