Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f15faca4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allowlist more frameworks" into main am: 8ec32beb am: 42ed0ff7 am:...

Merge "Allowlist more frameworks" into main am: 8ec32beb am: 42ed0ff7 am: 5c91caac am: 2ac6bb96

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759607



Change-Id: I23202a241e772cdee506cd74f568e5113a3931dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4578a47 2ac6bb96
Loading
Loading
Loading
Loading
+99 −102
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ var (
		"external/jsr330":                        Bp2BuildDefaultTrueRecursively,
		"external/junit":                         Bp2BuildDefaultTrueRecursively,
		"external/kotlinc":                       Bp2BuildDefaultTrueRecursively,
		"external/kotlinx.coroutines":            Bp2BuildDefaultTrueRecursively,
		"external/libaom":                        Bp2BuildDefaultTrueRecursively,
		"external/libavc":                        Bp2BuildDefaultTrueRecursively,
		"external/libcap":                        Bp2BuildDefaultTrueRecursively,
@@ -186,8 +187,8 @@ var (
		"external/libhevc":                       Bp2BuildDefaultTrueRecursively,
		"external/libjpeg-turbo":                 Bp2BuildDefaultTrueRecursively,
		"external/libmpeg2":                      Bp2BuildDefaultTrueRecursively,
		"external/libpng":                        Bp2BuildDefaultTrueRecursively,
		"external/libphonenumber":                Bp2BuildDefaultTrueRecursively,
		"external/libpng":                        Bp2BuildDefaultTrueRecursively,
		"external/libvpx":                        Bp2BuildDefaultTrueRecursively,
		"external/libyuv":                        Bp2BuildDefaultTrueRecursively,
		"external/lz4/lib":                       Bp2BuildDefaultTrue,
@@ -203,12 +204,12 @@ var (
		"external/pcre":                          Bp2BuildDefaultTrueRecursively,
		"external/perfmark/api":                  Bp2BuildDefaultTrueRecursively,
		"external/protobuf":                      Bp2BuildDefaultTrueRecursively,
		"external/python/pyfakefs/pyfakefs":      Bp2BuildDefaultTrueRecursively,
		"external/python/pyyaml/lib/yaml":        Bp2BuildDefaultTrueRecursively,
		"external/python/six":                    Bp2BuildDefaultTrueRecursively,
		"external/python/jinja/src":              Bp2BuildDefaultTrueRecursively,
		"external/python/markupsafe/src":         Bp2BuildDefaultTrueRecursively,
		"external/python/pyfakefs/pyfakefs":      Bp2BuildDefaultTrueRecursively,
		"external/python/pyyaml/lib/yaml":        Bp2BuildDefaultTrueRecursively,
		"external/python/setuptools":             Bp2BuildDefaultTrueRecursively,
		"external/python/six":                    Bp2BuildDefaultTrueRecursively,
		"external/rappor":                        Bp2BuildDefaultTrueRecursively,
		"external/scudo":                         Bp2BuildDefaultTrueRecursively,
		"external/selinux/checkpolicy":           Bp2BuildDefaultTrueRecursively,
@@ -219,6 +220,7 @@ var (
		"external/tinyalsa":                      Bp2BuildDefaultTrueRecursively,
		"external/tinyalsa_new":                  Bp2BuildDefaultTrueRecursively,
		"external/toybox":                        Bp2BuildDefaultTrueRecursively,
		"external/truth":                         Bp2BuildDefaultTrueRecursively,
		"external/xz-java":                       Bp2BuildDefaultTrueRecursively,
		"external/zlib":                          Bp2BuildDefaultTrueRecursively,
		"external/zopfli":                        Bp2BuildDefaultTrueRecursively,
@@ -238,6 +240,7 @@ var (
		"frameworks/base/apex/jobscheduler/service/jni":                        Bp2BuildDefaultTrueRecursively,
		"frameworks/base/core/java":                                            Bp2BuildDefaultTrue,
		"frameworks/base/core/res":                                             Bp2BuildDefaultTrueRecursively,
		"frameworks/base/errorprone":                                           Bp2BuildDefaultTrueRecursively,
		"frameworks/base/libs/androidfw":                                       Bp2BuildDefaultTrue,
		"frameworks/base/libs/services":                                        Bp2BuildDefaultTrue,
		"frameworks/base/media/tests/MediaDump":                                Bp2BuildDefaultTrue,
@@ -255,7 +258,8 @@ var (
		"frameworks/hardware/interfaces/displayservice":                        Bp2BuildDefaultTrueRecursively,
		"frameworks/hardware/interfaces/stats/aidl":                            Bp2BuildDefaultTrue,
		"frameworks/libs/modules-utils/build":                                  Bp2BuildDefaultTrueRecursively,
		"frameworks/libs/modules-utils/java":                 Bp2BuildDefaultTrue,
		"frameworks/libs/modules-utils/java":                                   Bp2BuildDefaultTrueRecursively,
		"frameworks/libs/modules-utils/java/com/android/modules/utils/testing": Bp2BuildDefaultFalseRecursively,
		"frameworks/native":                                                    Bp2BuildDefaultTrue,
		"frameworks/native/libs/adbd_auth":                                     Bp2BuildDefaultTrueRecursively,
		"frameworks/native/libs/arect":                                         Bp2BuildDefaultTrueRecursively,
@@ -330,28 +334,29 @@ var (
		"packages/apps/Protips":                                      Bp2BuildDefaultTrue,
		"packages/apps/SafetyRegulatoryInfo":                         Bp2BuildDefaultTrue,
		"packages/apps/WallpaperPicker":                              Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/driver/cache":       Bp2BuildDefaultTrueRecursively,
		"packages/modules/StatsD/lib/libstatssocket":         Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb":                               Bp2BuildDefaultTrue,
		"packages/modules/adb/apex":                          Bp2BuildDefaultTrue,
		"packages/modules/adb/fastdeploy":                    Bp2BuildDefaultTrue,
		"packages/modules/adb/crypto":                        Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/libs":                          Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_auth":                  Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_connection":            Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/proto":                         Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/tls":                           Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/bpf_progs":                    Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/service-t":                    Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/service/native":               Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/native":            Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/netd":              Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/staticlibs/netd/libnetdutils": Bp2BuildDefaultTrueRecursively,
		"packages/modules/Connectivity/tests/unit/jni":               Bp2BuildDefaultTrueRecursively,
		"packages/modules/Gki/libkver":                               Bp2BuildDefaultTrue,
		"packages/modules/NetworkStack/common/captiveportal":         Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/apex":                       Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/apex/testing":               Bp2BuildDefaultTrue,
		"packages/modules/NeuralNetworks/driver/cache":               Bp2BuildDefaultTrueRecursively,
		"packages/modules/SdkExtensions/gen_sdk":                     Bp2BuildDefaultTrue,
		"packages/modules/StatsD/lib/libstatssocket":                 Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb":                                       Bp2BuildDefaultTrue,
		"packages/modules/adb/apex":                                  Bp2BuildDefaultTrue,
		"packages/modules/adb/crypto":                                Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/fastdeploy":                            Bp2BuildDefaultTrue,
		"packages/modules/adb/libs":                                  Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_auth":                          Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/pairing_connection":                    Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/proto":                                 Bp2BuildDefaultTrueRecursively,
		"packages/modules/adb/tls":                                   Bp2BuildDefaultTrueRecursively,
		"packages/modules/common/proto":                              Bp2BuildDefaultTrue,
		"packages/providers/MediaProvider/tools/dialogs":             Bp2BuildDefaultFalse, // TODO(b/242834374)
		"packages/screensavers/Basic":                                Bp2BuildDefaultTrue,
@@ -363,19 +368,20 @@ var (

		"prebuilts/clang/host/linux-x86":                   Bp2BuildDefaultTrueRecursively,
		"prebuilts/gradle-plugin":                          Bp2BuildDefaultTrueRecursively,
		"prebuilts/runtime/mainline/platform/sdk":          Bp2BuildDefaultTrueRecursively,
		"prebuilts/module_sdk":                             Bp2BuildDefaultTrueRecursively,
		"prebuilts/runtime/mainline/platform/sdk":          Bp2BuildDefaultTrueRecursively,
		"prebuilts/sdk":                                    Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/androidx":                   Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/androidx-legacy":            Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/app-toolkit":         Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/constraint-layout-x": Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/material-design-x":   Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/extras/app-toolkit":         Bp2BuildDefaultTrue,
		"prebuilts/sdk/current/support":                    Bp2BuildDefaultTrue,
		"prebuilts/tools":                                  Bp2BuildDefaultTrue,
		"prebuilts/tools/common/m2":                        Bp2BuildDefaultTrue,
		"prebuilts/r8":                                     Bp2BuildDefaultTrueRecursively,

		"sdk/annotations":   Bp2BuildDefaultTrueRecursively,
		"sdk/dumpeventlog":  Bp2BuildDefaultTrue,
		"sdk/eventanalyzer": Bp2BuildDefaultTrue,

@@ -623,6 +629,7 @@ var (
		"codec2_soft_exports",
		"compatibility_matrix_schema",
		"framework-connectivity-protos",
		"framework-connectivity-javastream-protos",
		"gemmlowp_headers",
		"gl_headers",
		"libandroid_runtime_lazy",
@@ -855,15 +862,6 @@ var (
		// for api_fingerprint.txt generation
		"api_fingerprint",

		// allowlisting for kotlinx_coroutines
		"annotations",
		"kotlinx-coroutines-android-annotation-stubs",
		"kotlinx-coroutines-core",
		"kotlinx_coroutines",
		"kotlinx_coroutines-device",
		"kotlinx_coroutines-host",
		"kotlinx_coroutines_android",

		// for building com.android.neuralnetworks
		"libimapper_stablec",
		"libimapper_providerutils",
@@ -975,7 +973,6 @@ var (
		"protoc-gen-grpc-java-plugin",
		"perfetto_trace-full",
		"tf-remote-client",
		"truth",
		"tradefed-lite",
		"tradefed-isolation-protos",
		"snakeyaml_patched_src_files",
@@ -1125,6 +1122,11 @@ var (
		// rust support
		"libtombstoned_client_rust_bridge_code", "libtombstoned_client_wrapper", // rust conversions are not supported

		// TODO: b/303474748 - aidl rules for java are incompatible with parcelable declarations
		"modules-utils-list-slice",
		"modules-utils-os",
		"modules-utils-synchronous-result-receiver",

		// unconverted deps
		"CarHTMLViewer",                          // depends on unconverted modules android.car-stubs, car-ui-lib
		"adb",                                    // depends on unconverted modules: AdbWinApi, libandroidfw, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi
@@ -1168,6 +1170,7 @@ var (
		"libstatslog_art",           // depends on unconverted modules: statslog_art.cpp, statslog_art.h
		"linker_reloc_bench_main",   // depends on unconverted modules: liblinker_reloc_bench_*
		"malloc-rss-benchmark",      // depends on unconverted modules: libmeminfo
		"modules-utils-expresslog",  // depends on unconverted modules: framework-statsd
		"pbtombstone", "crash_dump", // depends on libdebuggerd, libunwindstack
		"releasetools_test",             // depends on unconverted modules: com.android.apex.compressed.v1
		"robolectric-sqlite4java-0.282", // depends on unconverted modules: robolectric-sqlite4java-import, robolectric-sqlite4java-native
@@ -1663,13 +1666,7 @@ var (
		"libtest_with_dependency_loop_c",
		"libtestshared",

		// depends on unconverted libprotobuf-java-nano
		"dnsresolverprotosnano",
		"launcherprotosnano",
		"datastallprotosnano",
		"devicepolicyprotosnano",
		"ota_metadata_proto_java",
		"merge_ota",
		"merge_ota", // depends on ota_metadata_proto_java

		// releasetools
		"verity_utils",