summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2024-02-08 01:37:34 -0800
committer Stephen Hines <srhines@google.com> 2024-02-08 01:37:34 -0800
commit728bb716b6f0358dd9aaa81e509a78c31e23cb59 (patch)
treedd14f2fa5bb86faa1bb359477e1d3461e5bc1bbf
parent45fd693433f8bbccabe0cbdbac6c09f2167e31ca (diff)
Temporarily remove toolchain/ from androidmk_denylist.go
There are defensive `Android.mk` files present in several top-level toolchain/ projects. Enforcing the denylist strictly breaks several builds, so this change temporarily relaxes that by removing our directories from the list. Test: Run Rust's test_compiler.py Change-Id: Ic00a305b78485543d098aeea42c2d2b93f979430
-rw-r--r--ui/build/androidmk_denylist.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/build/androidmk_denylist.go b/ui/build/androidmk_denylist.go
index 9aeaf9d8e..e7896ab29 100644
--- a/ui/build/androidmk_denylist.go
+++ b/ui/build/androidmk_denylist.go
@@ -30,7 +30,8 @@ var androidmk_denylist []string = []string{
"libcore/",
"libnativehelper/",
"pdk/",
- "toolchain/",
+ // Add back toolchain/ once defensive Android.mk files are removed
+ //"toolchain/",
}
func blockAndroidMks(ctx Context, androidMks []string) {