From e848bb2c510d6ec3cb76ffa3e8e00aedc70f018c Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 29 Jun 2023 09:21:50 -0400 Subject: [PATCH] Allowlist additional deps of inputflinger Test: bp2build.sh Change-Id: Ie6a750f5ef28e9380a6d01ea68daeeb7244da805 --- android/allowlists/allowlists.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index af97325e4..34f6993d4 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -140,11 +140,12 @@ var ( "external/expat": Bp2BuildDefaultTrueRecursively, "external/f2fs-tools": Bp2BuildDefaultTrue, "external/flac": Bp2BuildDefaultTrueRecursively, + "external/flatbuffers": Bp2BuildDefaultTrueRecursively, "external/fmtlib": Bp2BuildDefaultTrueRecursively, "external/fsverity-utils": Bp2BuildDefaultTrueRecursively, - "external/guava": Bp2BuildDefaultTrueRecursively, "external/google-benchmark": Bp2BuildDefaultTrueRecursively, "external/googletest": Bp2BuildDefaultTrueRecursively, + "external/guava": Bp2BuildDefaultTrueRecursively, "external/gwp_asan": Bp2BuildDefaultTrueRecursively, "external/hamcrest": Bp2BuildDefaultTrueRecursively, "external/icu": Bp2BuildDefaultTrueRecursively, @@ -226,6 +227,7 @@ var ( "frameworks/hardware/interfaces/stats/aidl": Bp2BuildDefaultTrue, "frameworks/libs/modules-utils/build": Bp2BuildDefaultTrueRecursively, "frameworks/libs/net/common/native": Bp2BuildDefaultTrueRecursively, + "frameworks/native": Bp2BuildDefaultTrue, "frameworks/native/libs/adbd_auth": Bp2BuildDefaultTrueRecursively, "frameworks/native/libs/arect": Bp2BuildDefaultTrueRecursively, "frameworks/native/libs/gui": Bp2BuildDefaultTrue, @@ -471,6 +473,8 @@ var ( Bp2buildModuleAlwaysConvertList = []string{ "libidmap2_policies", "libSurfaceFlingerProp", + "toolbox_input_labels", + // cc mainline modules // com.android.media.swcodec @@ -488,7 +492,6 @@ var ( "code_coverage.policy.other", "codec2_soft_exports", "compatibility_matrix_schema", - "flatbuffer_headers", "framework-connectivity-protos", "gemmlowp_headers", "gl_headers", @@ -611,10 +614,6 @@ var ( "libhidlbase", // needed by cc_hidl_library "libhidl_gtest_helper", - //frameworks/native - "framework_native_aidl_binder", - "framework_native_aidl_gui", - //frameworks/native/libs/input "inputconstants_aidl",