aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKousik Kumar <kousikk@google.com>2022-06-20 22:51:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-20 22:51:08 +0000
commit5260803c6714b2dae52f5d08ae5ac280369c77c1 (patch)
tree36bb8efe6a7c9afdb1e138c8f373de0ebcee2be6
parentd43d94c657aebe33d6f67d6f5f19708ed431b54d (diff)
parent9dedb60c6ac48c45d5a05ce723041bdad3d53af8 (diff)
downloadsoong-5260803c6714b2dae52f5d08ae5ac280369c77c1.tar.gz
[conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9dedb60c6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226 Change-Id: Ib2a74d51922781b454c611e408b55bf67b14ddda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--ui/build/paths/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 81c500d2b..831a80f97 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -91,6 +91,7 @@ var Configuration = map[string]PathConfig{
"pstree": Allowed,
"rsync": Allowed,
"sh": Allowed,
+ "stubby": Allowed,
"tr": Allowed,
"unzip": Allowed,
"zip": Allowed,