From 728bb716b6f0358dd9aaa81e509a78c31e23cb59 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 8 Feb 2024 01:37:34 -0800
Subject: [PATCH] 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
---
 ui/build/androidmk_denylist.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) {