StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allowlist directories for tradefed's deps." into main am: 6b73be150c am: be81da7e7e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763425

Change-Id: Idd827dad4fcea78499a24a0414f8b8506ae143b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jingwen Chen
2023-09-28 09:12:03 +00:00
committed by Automerger Merge Worker
parent dbfe6b66dc be81da7e7e
commit bb3ab13a34
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/allowlists/allowlists.go
View File

@@ -142,6 +142,7 @@ var (
"external/bzip2": Bp2BuildDefaultTrueRecursively, "external/bzip2": Bp2BuildDefaultTrueRecursively,
"external/clang/lib": Bp2BuildDefaultTrue, "external/clang/lib": Bp2BuildDefaultTrue,
"external/conscrypt": Bp2BuildDefaultTrue, "external/conscrypt": Bp2BuildDefaultTrue,
"external/dexmaker": Bp2BuildDefaultTrueRecursively,
"external/e2fsprogs": Bp2BuildDefaultTrueRecursively, "external/e2fsprogs": Bp2BuildDefaultTrueRecursively,
"external/eigen": Bp2BuildDefaultTrueRecursively, "external/eigen": Bp2BuildDefaultTrueRecursively,
"external/erofs-utils": Bp2BuildDefaultTrueRecursively, "external/erofs-utils": Bp2BuildDefaultTrueRecursively,
@@ -194,6 +195,7 @@ var (
"external/lzma/C": Bp2BuildDefaultTrueRecursively, "external/lzma/C": Bp2BuildDefaultTrueRecursively,
"external/mdnsresponder": Bp2BuildDefaultTrueRecursively, "external/mdnsresponder": Bp2BuildDefaultTrueRecursively,
"external/minijail": Bp2BuildDefaultTrueRecursively, "external/minijail": Bp2BuildDefaultTrueRecursively,
"external/mockito": Bp2BuildDefaultTrueRecursively,
"external/musl": Bp2BuildDefaultTrueRecursively, "external/musl": Bp2BuildDefaultTrueRecursively,
"external/objenesis": Bp2BuildDefaultTrueRecursively, "external/objenesis": Bp2BuildDefaultTrueRecursively,
"external/openscreen": Bp2BuildDefaultTrueRecursively, "external/openscreen": Bp2BuildDefaultTrueRecursively,
@@ -452,6 +454,7 @@ var (
"tools/metalava": Bp2BuildDefaultTrueRecursively, "tools/metalava": Bp2BuildDefaultTrueRecursively,
"tools/platform-compat/java/android/compat": Bp2BuildDefaultTrueRecursively, "tools/platform-compat/java/android/compat": Bp2BuildDefaultTrueRecursively,
"tools/platform-compat/java/androidprocessor": Bp2BuildDefaultTrueRecursively, "tools/platform-compat/java/androidprocessor": Bp2BuildDefaultTrueRecursively,
"tools/tradefederation/core/util_apps": Bp2BuildDefaultTrueRecursively,
"tools/tradefederation/prebuilts/filegroups": Bp2BuildDefaultTrueRecursively, "tools/tradefederation/prebuilts/filegroups": Bp2BuildDefaultTrueRecursively,
} }
@@ -932,9 +935,7 @@ var (
"androidx.test.annotation-nodeps", "androidx.test.annotation-nodeps",
// jni deps of an internal android_test (b/297405812) // jni deps of an internal android_test (b/297405812)
"libdexmakerjvmtiagent",
"libopenjdkjvmti_headers", "libopenjdkjvmti_headers",
"libstaticjvmtiagent",
// tradefed deps // tradefed deps
"tradefed-protos", "tradefed-protos",
@@ -1754,6 +1755,13 @@ var (
"NanoAndroidTest", "NanoAndroidTest",
"MtsLibnativehelperTestCases", "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 // android_test_helper_app from allowlisted packages, but with unconverted deps
"SharedLibraryInfoTestApp", "SharedLibraryInfoTestApp",
} }