From 7501a1b15b4a7cc80bee1a2322828c681961056b Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Tue, 26 Sep 2023 10:49:28 +0000 Subject: [PATCH] Allowlist directories for tradefed's deps. Fix: 302094734 Test: presubmits/bp2build-incremental Test: b build //tools/tradefederation/core/util_apps/... --config=android Change-Id: I3d35650a1001defb74eb93a62b361109a5baccd9 --- android/allowlists/allowlists.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index ed796c753..de6fde1df 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -142,6 +142,7 @@ var ( "external/bzip2": Bp2BuildDefaultTrueRecursively, "external/clang/lib": Bp2BuildDefaultTrue, "external/conscrypt": Bp2BuildDefaultTrue, + "external/dexmaker": Bp2BuildDefaultTrueRecursively, "external/e2fsprogs": Bp2BuildDefaultTrueRecursively, "external/eigen": Bp2BuildDefaultTrueRecursively, "external/erofs-utils": Bp2BuildDefaultTrueRecursively, @@ -194,6 +195,7 @@ var ( "external/lzma/C": Bp2BuildDefaultTrueRecursively, "external/mdnsresponder": Bp2BuildDefaultTrueRecursively, "external/minijail": Bp2BuildDefaultTrueRecursively, + "external/mockito": Bp2BuildDefaultTrueRecursively, "external/musl": Bp2BuildDefaultTrueRecursively, "external/objenesis": Bp2BuildDefaultTrueRecursively, "external/openscreen": Bp2BuildDefaultTrueRecursively, @@ -450,6 +452,7 @@ var ( "tools/metalava": Bp2BuildDefaultTrueRecursively, "tools/platform-compat/java/android/compat": Bp2BuildDefaultTrueRecursively, "tools/platform-compat/java/androidprocessor": Bp2BuildDefaultTrueRecursively, + "tools/tradefederation/core/util_apps": Bp2BuildDefaultTrueRecursively, "tools/tradefederation/prebuilts/filegroups": Bp2BuildDefaultTrueRecursively, } @@ -935,9 +938,7 @@ var ( "androidx.test.annotation-nodeps", // jni deps of an internal android_test (b/297405812) - "libdexmakerjvmtiagent", "libopenjdkjvmti_headers", - "libstaticjvmtiagent", // tradefed deps "tradefed-protos", @@ -1757,6 +1758,13 @@ var ( "NanoAndroidTest", "MtsLibnativehelperTestCases", + // Depends on androidx.test.rules + "DexmakerTests", + "dexmaker-tests-lib", + "dexmaker-mockmaker-tests", + "dexmaker-inline-mockmaker-tests", + "dexmaker-extended-mockmaker-tests", + // android_test_helper_app from allowlisted packages, but with unconverted deps "SharedLibraryInfoTestApp", }