OSDN Git Service

shim::Acl should only run if gd::Core disabled
authorChris Manton <cmanton@google.com>
Thu, 3 Sep 2020 02:56:22 +0000 (19:56 -0700)
committerChris Manton <cmanton@google.com>
Thu, 3 Sep 2020 02:57:46 +0000 (19:57 -0700)
Bug: 166280067
Test: compile
Tag: #refactor
Change-Id: I6f79df1b7126d5237d9b2c9bcac3c3a65aaff19c

main/shim/stack.cc

index a3fbff5..a39ee25 100644 (file)
@@ -106,7 +106,9 @@ void Stack::StartEverything() {
                    stack_manager_.GetInstance<neighbor::InquiryModule>());
   }
   if (common::InitFlags::GdAclEnabled()) {
-    acl_ = new legacy::Acl(stack_handler_);
+    if (!common::InitFlags::GdCoreEnabled()) {
+      acl_ = new legacy::Acl(stack_handler_);
+    }
   }
   is_running_ = true;
   if (!common::InitFlags::GdCoreEnabled()) {