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

Commit 59c33ac8 authored by Vinh Tran's avatar Vinh Tran Committed by Gerrit Code Review
Browse files

Merge "Allowlist libneuralnetworks's dependencies"

parents a37ef683 c3fd556f
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -293,6 +293,8 @@ var (
		"system/tools/aidl/build/tests_bp2build":                 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,
@@ -382,6 +384,7 @@ var (
		"libnativeloader-headers",
		"libnativewindow_headers",
		"libneuralnetworks_headers",
		"libneuralnetworks_packageinfo",
		"libopus",
		"libpdx_headers",
		"libprocpartition",
@@ -421,11 +424,14 @@ 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",
@@ -547,9 +553,6 @@ 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
@@ -615,7 +618,6 @@ 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
@@ -1078,6 +1080,12 @@ 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{}