From be1315eb41f4524bcb418b4e03e7934d1011b772 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Tue, 10 May 2022 09:15:31 -0400 Subject: [PATCH] Add blockers of cc mainline modules to allowlist Test: mixed_droid.sh Change-Id: If14254d192c67a76e307fa2fc7d732a648879cb5 --- android/allowlists/allowlists.go | 40 +++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 9aae6fdb8..7df40991d 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -39,14 +39,15 @@ var ( Bp2buildDefaultConfig = Bp2BuildConfig{ "art/libartpalette": Bp2BuildDefaultTrueRecursively, "art/libdexfile": Bp2BuildDefaultTrueRecursively, + "art/libnativebridge": Bp2BuildDefaultTrueRecursively, "art/runtime": Bp2BuildDefaultTrueRecursively, "art/tools": Bp2BuildDefaultTrue, "bionic": Bp2BuildDefaultTrueRecursively, "bootable/recovery/tools/recovery_l10n": Bp2BuildDefaultTrue, + "build/bazel/examples/apex/minimal": Bp2BuildDefaultTrueRecursively, "build/bazel/examples/soong_config_variables": Bp2BuildDefaultTrueRecursively, - "build/bazel/examples/apex/minimal": Bp2BuildDefaultTrueRecursively, - "build/make/tools/signapk": Bp2BuildDefaultTrue, "build/make/target/product/security": Bp2BuildDefaultTrue, + "build/make/tools/signapk": Bp2BuildDefaultTrue, "build/soong": Bp2BuildDefaultTrue, "build/soong/cc/libbuildversion": Bp2BuildDefaultTrue, // Skip tests subdir "build/soong/cc/ndkstubgen": Bp2BuildDefaultTrue, @@ -90,6 +91,7 @@ var ( "development/samples/VoicemailProviderDemo": Bp2BuildDefaultTrue, "development/samples/WiFiDirectDemo": Bp2BuildDefaultTrue, "development/sdk": Bp2BuildDefaultTrueRecursively, + "external/aac": Bp2BuildDefaultTrueRecursively, "external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively, "external/auto/android-annotation-stubs": Bp2BuildDefaultTrueRecursively, "external/auto/common": Bp2BuildDefaultTrueRecursively, @@ -99,7 +101,9 @@ var ( "external/brotli": Bp2BuildDefaultTrue, "external/conscrypt": Bp2BuildDefaultTrue, "external/e2fsprogs": Bp2BuildDefaultTrueRecursively, + "external/eigen": Bp2BuildDefaultTrueRecursively, "external/error_prone": Bp2BuildDefaultTrueRecursively, + "external/flac": Bp2BuildDefaultTrueRecursively, "external/fmtlib": Bp2BuildDefaultTrueRecursively, "external/google-benchmark": Bp2BuildDefaultTrueRecursively, "external/googletest": Bp2BuildDefaultTrueRecursively, @@ -113,10 +117,14 @@ var ( "external/jemalloc_new": Bp2BuildDefaultTrueRecursively, "external/jsoncpp": Bp2BuildDefaultTrueRecursively, "external/junit": Bp2BuildDefaultTrueRecursively, + "external/libavc": Bp2BuildDefaultTrueRecursively, "external/libcap": Bp2BuildDefaultTrueRecursively, "external/libcxx": Bp2BuildDefaultTrueRecursively, "external/libcxxabi": Bp2BuildDefaultTrueRecursively, "external/libevent": Bp2BuildDefaultTrueRecursively, + "external/libgav1": Bp2BuildDefaultTrueRecursively, + "external/libhevc": Bp2BuildDefaultTrueRecursively, + "external/libmpeg2": Bp2BuildDefaultTrueRecursively, "external/libpng": Bp2BuildDefaultTrueRecursively, "external/lz4/lib": Bp2BuildDefaultTrue, "external/lzma/C": Bp2BuildDefaultTrueRecursively, @@ -131,10 +139,15 @@ var ( "external/selinux/libsepol": Bp2BuildDefaultTrueRecursively, "external/zlib": Bp2BuildDefaultTrueRecursively, "external/zstd": Bp2BuildDefaultTrueRecursively, + "frameworks/av/media/codecs/g711/decoder": Bp2BuildDefaultTrueRecursively, + "frameworks/av/services/minijail": Bp2BuildDefaultTrueRecursively, "frameworks/base/media/tests/MediaDump": Bp2BuildDefaultTrue, "frameworks/base/startop/apps/test": Bp2BuildDefaultTrue, "frameworks/base/tests/appwidgets/AppWidgetHostTest": Bp2BuildDefaultTrueRecursively, "frameworks/native/libs/adbd_auth": Bp2BuildDefaultTrueRecursively, + "frameworks/native/libs/arect": Bp2BuildDefaultTrueRecursively, + "frameworks/native/libs/math": Bp2BuildDefaultTrueRecursively, + "frameworks/native/libs/nativebase": Bp2BuildDefaultTrueRecursively, "frameworks/native/opengl/tests/gl2_cameraeye": Bp2BuildDefaultTrue, "frameworks/native/opengl/tests/gl2_java": Bp2BuildDefaultTrue, "frameworks/native/opengl/tests/testLatency": Bp2BuildDefaultTrue, @@ -160,8 +173,8 @@ var ( "prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively, "prebuilts/tools/common/m2": Bp2BuildDefaultTrue, "system/apex": Bp2BuildDefaultFalse, // TODO(b/207466993): flaky failures - "system/apex/proto": Bp2BuildDefaultTrueRecursively, "system/apex/libs": Bp2BuildDefaultTrueRecursively, + "system/apex/proto": Bp2BuildDefaultTrueRecursively, "system/core/debuggerd": Bp2BuildDefaultTrueRecursively, "system/core/diagnose_usb": Bp2BuildDefaultTrueRecursively, "system/core/libasyncio": Bp2BuildDefaultTrue, @@ -175,10 +188,14 @@ var ( "system/core/libutils": Bp2BuildDefaultTrueRecursively, "system/core/libvndksupport": Bp2BuildDefaultTrueRecursively, "system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively, + "system/libartpalette": Bp2BuildDefaultTrueRecursively, "system/libbase": Bp2BuildDefaultTrueRecursively, + "system/libfmq": Bp2BuildDefaultTrue, + "system/libhwbinder": Bp2BuildDefaultTrueRecursively, "system/libprocinfo": Bp2BuildDefaultTrue, "system/libziparchive": Bp2BuildDefaultTrueRecursively, "system/logging/liblog": Bp2BuildDefaultTrueRecursively, + "system/media/audio": Bp2BuildDefaultTrueRecursively, "system/memory/libmemunreachable": Bp2BuildDefaultTrueRecursively, "system/sepolicy/apex": Bp2BuildDefaultTrueRecursively, "system/timezone/apex": Bp2BuildDefaultTrueRecursively, @@ -237,6 +254,23 @@ var ( } Bp2buildModuleAlwaysConvertList = []string{ + // cc mainline modules + "libnativeloader-headers", + "libgui_bufferqueue_sources", + "code_coverage.policy", + "code_coverage.policy.other", + "codec2_soft_exports", + "com.android.media.swcodec-ld.config.txt", + "libcodec2_headers", + "libcodec2_internal", + "com.android.media.swcodec-mediaswcodec.rc", + "flatbuffer_headers", + "gemmlowp_headers", + "gl_headers", + "libbluetooth-types-header", + "libaudioclient_aidl_conversion_util", + "libaudioutils_fixedfft", + //external/avb "avbtool", "libavb",