Merge "Revert "Allowlist libneuralnetworks's dependencies"" (e53c7ea2) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+4 −12

Original line number	Diff line number	Diff line
		@@ -296,8 +296,6 @@ var (
		"system/tools/sysprop": Bp2BuildDefaultTrue,
		"system/unwinding/libunwindstack": Bp2BuildDefaultTrueRecursively,

		"frameworks/proto_logging/stats": Bp2BuildDefaultTrueRecursively,

		"tools/apksig": Bp2BuildDefaultTrue,
		"tools/platform-compat/java/android/compat": Bp2BuildDefaultTrueRecursively,
		"tools/tradefederation/prebuilts/filegroups": Bp2BuildDefaultTrueRecursively,
		@@ -388,7 +386,6 @@ var (
		"libnativeloader-headers",
		"libnativewindow_headers",
		"libneuralnetworks_headers",
		"libneuralnetworks_packageinfo",
		"libopus",
		"libpdx_headers",
		"libprocpartition",
		@@ -428,14 +425,11 @@ var (
		"neuralnetworks_types",
		"neuralnetworks_utils_hal_aidl",
		"neuralnetworks_utils_hal_common",
		"neuralnetworks_utils_hal_service",
		"neuralnetworks_utils_hal_1_0",
		"neuralnetworks_utils_hal_1_1",
		"neuralnetworks_utils_hal_1_2",
		"neuralnetworks_utils_hal_1_3",
		"libneuralnetworks_common",
		// packagemanager_aidl_interface is created implicitly in packagemanager_aidl module
		"packagemanager_aidl_interface",
		"philox_random",
		"philox_random_headers",
		"server_configurable_flags",
		@@ -557,6 +551,9 @@ var (
		"prebuilt_platform-robolectric-4.4-prebuilt", // aosp/1999250, needs .aar support in Jars
		"prebuilt_platform-robolectric-4.5.1-prebuilt", // aosp/1999250, needs .aar support in Jars

		// proto support
		"libstats_proto_host", // TODO(b/236055697): handle protos from other packages

		// path property for filegroups
		"conscrypt", // TODO(b/210751803), we don't handle path property for filegroups
		"conscrypt-for-host", // TODO(b/210751803), we don't handle path property for filegroups
		@@ -623,6 +620,7 @@ var (
		"pbtombstone", "crash_dump", // depends on libdebuggerd, libunwindstack
		"robolectric-sqlite4java-0.282", // depends on unconverted modules: robolectric-sqlite4java-import, robolectric-sqlite4java-native
		"static_crasher", // depends on unconverted modules: libdebuggerd_handler
		"stats-log-api-gen", // depends on unconverted modules: libstats_proto_host
		"statslog.cpp", "statslog.h", "statslog.rs", // depends on unconverted modules: stats-log-api-gen
		"statslog_art.cpp", "statslog_art.h", "statslog_header.rs", // depends on unconverted modules: stats-log-api-gen
		"test_fips", // depends on unconverted modules: adb
		@@ -1090,12 +1088,6 @@ var (
		"libtest_with_dependency_loop_b_tmp",
		"libtest_with_dependency_loop_c",
		"libtestshared",

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

		Bp2buildCcLibraryStaticOnlyList = []string{}