commit 4c2915af9569ced056702a01109de720035261f1
author Wyatt Hepler <hepler@google.com> Mon Oct 19 10:24:58 2020 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 19 18:14:50 2020 +0000
tree 7ea75135acfa69c89a143ac60ea0d85c4e66202b
parent fdebe5e511158506d8c251815af4af8078f1d7f7

pw_build: Allow non-present deps in remove_public_deps

Change-Id: Ie349a944d2ed0b04f51030cca0411d7fd8ab35c5
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/21821
Reviewed-by: Alexei Frolov <frolv@google.com>
Commit-Queue: Wyatt Hepler <hepler@google.com>

pw_build/target_types.gni

diff --git a/pw_build/target_types.gni b/pw_build/target_types.gni
index 1564e73..7590f2d 100644
--- a/pw_build/target_types.gni
+++ b/pw_build/target_types.gni
@@ -71,9 +71,10 @@
       public_deps = []
     }
     if (defined(remove_public_deps)) {
-      if (remove_public_deps[0] == "*") {
+      if (remove_public_deps != [] && remove_public_deps[0] == "*") {
         public_deps = []
       } else {
+        public_deps += remove_public_deps
         public_deps -= remove_public_deps
       }
     }
@@ -117,9 +118,10 @@
       public_deps = []
     }
     if (defined(remove_public_deps)) {
-      if (remove_public_deps[0] == "*") {
+      if (remove_public_deps != [] && remove_public_deps[0] == "*") {
         public_deps = []
       } else {
+        public_deps += remove_public_deps
         public_deps -= remove_public_deps
       }
     }
@@ -165,9 +167,10 @@
       public_deps = []
     }
     if (defined(remove_public_deps)) {
-      if (remove_public_deps[0] == "*") {
+      if (remove_public_deps != [] && remove_public_deps[0] == "*") {
         public_deps = []
       } else {
+        public_deps += remove_public_deps
         public_deps -= remove_public_deps
       }
     }
@@ -216,9 +219,10 @@
       public_deps = []
     }
     if (defined(remove_public_deps)) {
-      if (remove_public_deps[0] == "*") {
+      if (remove_public_deps != [] && remove_public_deps[0] == "*") {
         public_deps = []
       } else {
+        public_deps += remove_public_deps
         public_deps -= remove_public_deps
       }
     }