summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinh Tran <vinhdaitran@google.com> 2022-09-14 17:39:04 -0400
committer Vinh Tran <vinhdaitran@google.com> 2022-09-19 11:21:39 -0400
commitc3fd556fd724e3c750c19b91e2f8eaebf46b41fa (patch)
tree681f3755dcce9146988750f2f82bae87d190ab0c
parent2a85fb195dde37d773068b545aef4a52c644287f (diff)
Allowlist libneuralnetworks's dependencies
Except for statslog_neuralnetworks.cpp and statslog_neuralnetworks.h which are blocked by b/247536535. Bug: 232486397 Test: CI Change-Id: I77c8d47364fe33d0869d23f1c1c9eacd73ef7cc6
-rw-r--r--android/allowlists/allowlists.go16
1 files changed, 12 insertions, 4 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 872e6a0ca..ab71a4675 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -287,6 +287,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,
@@ -375,6 +377,7 @@ var (
"libnativeloader-headers",
"libnativewindow_headers",
"libneuralnetworks_headers",
+ "libneuralnetworks_packageinfo",
"libopus",
"libpdx_headers",
"libprocpartition",
@@ -414,11 +417,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",
@@ -539,9 +545,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
@@ -607,7 +610,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
@@ -1070,6 +1072,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{}