diff options
| author | 2025-03-24 18:26:22 -0700 | |
|---|---|---|
| committer | 2025-03-24 18:26:22 -0700 | |
| commit | fc5e8dc9c38db6628ed1d9172161187da74b066f (patch) | |
| tree | d9f495586f867878d601c34c59eb3c49ec3d5a53 /ui | |
| parent | 1248ced0cad29018090e65e3762585cdd774e864 (diff) | |
| parent | c2e8b6c102f4b4b44e2568f07d95fc674bbd2ef0 (diff) | |
Snap for 13264465 from c2e8b6c102f4b4b44e2568f07d95fc674bbd2ef0 to 25Q2-release
Change-Id: I6875fd165cc96cc880a3ac7842a516a7b9e70978
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/androidmk_denylist.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ui/build/androidmk_denylist.go b/ui/build/androidmk_denylist.go index 622aadb95..82666548d 100644 --- a/ui/build/androidmk_denylist.go +++ b/ui/build/androidmk_denylist.go @@ -62,6 +62,7 @@ var androidmk_denylist []string = []string{ var androidmk_allowlist []string = []string{ "art/Android.mk", "bootable/deprecated-ota/updater/Android.mk", + "tools/vendor/google_prebuilts/arc/Android.mk", } func getAllLines(ctx Context, filename string) []string { @@ -77,8 +78,17 @@ func getAllLines(ctx Context, filename string) []string { } func blockAndroidMks(ctx Context, androidMks []string) { - allowlist := getAllLines(ctx, "vendor/google/build/androidmk/allowlist.txt") - androidmk_allowlist = append(androidmk_allowlist, allowlist...) + allowlist_files := []string{ + "vendor/google/build/androidmk/allowlist.txt", + "device/google/clockwork/build/androidmk/allowlist.txt", + "device/google/sdv/androidmk/allowlist.txt", + } + for _, allowlist_file := range allowlist_files { + allowlist := getAllLines(ctx, allowlist_file) + androidmk_allowlist = append(androidmk_allowlist, allowlist...) + } + slices.Sort(androidmk_allowlist) + androidmk_allowlist = slices.Compact(androidmk_allowlist) denylist := getAllLines(ctx, "vendor/google/build/androidmk/denylist.txt") androidmk_denylist = append(androidmk_denylist, denylist...) |