From 2ea2ff81e0bf4788f2f4edb6172b9d6411d4e1a0 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 29 Oct 2021 18:16:12 +0100 Subject: [PATCH] Add prebuilt dependencies for the ART module. All these dependencies already exist in allowed_deps.txt, but without "prebuilt_" prefixes. They are used only when the ART module is built from prebuilts of its dependencies, i.e. with the master-art thin manifest. Test: env TARGET_BUILD_APPS=com.google.android.art \ vendor/google/build/mainline_modules_sdks.sh using the thin master-art manifest Bug: 202192894 Change-Id: I4b70e3dbdb30cdc9d25b92866b40f6f05babed20 --- build/allowed_deps.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 248d98a..a28b4de 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -796,8 +796,13 @@ prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:14) prebuilt_asm-7.0(minSdkVersion:current) prebuilt_asm-commons-7.0(minSdkVersion:current) prebuilt_asm-tree-7.0(minSdkVersion:current) +prebuilt_bionic_libc_platform_headers(minSdkVersion:(no version)) prebuilt_com.google.android.material_material-nodeps(minSdkVersion:(no version)) prebuilt_com.google.android.material_material-nodeps(minSdkVersion:14) +prebuilt_crtbegin_dynamic(minSdkVersion:(no version)) +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:current) prebuilt_glide-prebuilt(minSdkVersion:14) @@ -808,11 +813,14 @@ 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_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_libperfetto_client_experimental(minSdkVersion:(no version)) prebuilt_libunwind(minSdkVersion:(no version)) +prebuilt_perfetto_trace_protos(minSdkVersion:(no version)) prebuilt_test_framework-sdkextensions(minSdkVersion:(no version)) resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29) resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29)