Merge "Revert "Block new Android.mk added to all directories except the directories for partners"" into main

1 files changed, 13 insertions, 41 deletions

diff --git a/ui/build/androidmk_denylist.go b/ui/build/androidmk_denylist.go
index 7b7bb1fbe..cd49ec876 100644
--- a/ui/build/androidmk_denylist.go
+++ b/ui/build/androidmk_denylist.go
@@ -15,29 +15,20 @@
 package build
 
 import (
-	"os"
-	"slices"
 	"strings"
 )
 
 var androidmk_denylist []string = []string{
-	"art/",
 	"bionic/",
-	"bootable/",
-	"build/",
+	"chained_build_config/",
 	"cts/",
 	"dalvik/",
 	"developers/",
 	"development/",
 	"device/common/",
-	"device/generic/",
-	"device/google/",
 	"device/google_car/",
 	"device/sample/",
-	"external/",
 	"frameworks/",
-	"hardware/google/",
-	"hardware/interfaces/",
 	"hardware/libhardware/",
 	"hardware/libhardware_legacy/",
 	"hardware/ril/",
@@ -54,37 +45,24 @@ var androidmk_denylist []string = []string{
 	"sdk/",
 	"system/",
 	"test/",
-	"tools/",
 	"trusty/",
-	"toolchain/",
-}
-
-var androidmk_allowlist []string = []string{
-	"art/Android.mk",
-}
-
-func getAllLines(ctx Context, filename string) []string {
-	bytes, err := os.ReadFile(filename)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return []string{}
-		} else {
-			ctx.Fatalf("Could not read %s: %v", filename, err)
-		}
-	}
-	return strings.Split(strings.Trim(string(bytes), " \n"), "\n")
+	// Add back toolchain/ once defensive Android.mk files are removed
+	//"toolchain/",
+	"vendor/google_contexthub/",
+	"vendor/google_data/",
+	"vendor/google_elmyra/",
+	"vendor/google_mhl/",
+	"vendor/google_pdk/",
+	"vendor/google_testing/",
+	"vendor/partner_testing/",
+	"vendor/partner_tools/",
+	"vendor/pdk/",
 }
 
 func blockAndroidMks(ctx Context, androidMks []string) {
-	allowlist := getAllLines(ctx, "vendor/google/build/androidmk/allowlist.txt")
-	androidmk_allowlist = append(androidmk_allowlist, allowlist...)
-
-	denylist := getAllLines(ctx, "vendor/google/build/androidmk/denylist.txt")
-	androidmk_denylist = append(androidmk_denylist, denylist...)
-
 	for _, mkFile := range androidMks {
 		for _, d := range androidmk_denylist {
-			if strings.HasPrefix(mkFile, d) && !slices.Contains(androidmk_allowlist, mkFile) {
+			if strings.HasPrefix(mkFile, d) {
 				ctx.Fatalf("Found blocked Android.mk file: %s. "+
 					"Please see androidmk_denylist.go for the blocked directories and contact build system team if the file should not be blocked.", mkFile)
 			}
@@ -108,12 +86,6 @@ var external_androidmks []string = []string{
 	// These directories hold the published Android SDK, used in Unbundled Gradle builds.
 	"prebuilts/fullsdk-darwin",
 	"prebuilts/fullsdk-linux",
-	// wpa_supplicant_8 has been converted to Android.bp and Android.mk files are kept for troubleshooting.
-	"external/wpa_supplicant_8/",
-	// Empty Android.mk in package's top directory
-	"external/proguard/",
-	"external/swig/",
-	"toolchain/",
 }
 
 var art_androidmks = []string{