From 47435187e97a9ed4020ebe30c93363823c1b976d Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Wed, 2 Sep 2020 19:56:22 -0700
Subject: [PATCH] shim::Acl should only run if gd::Core disabled

Bug: 166280067
Test: compile
Tag: #refactor
Change-Id: I6f79df1b7126d5237d9b2c9bcac3c3a65aaff19c
---
 main/shim/stack.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/shim/stack.cc b/main/shim/stack.cc
index a3fbff558..a39ee2503 100644
--- a/main/shim/stack.cc
+++ b/main/shim/stack.cc
@@ -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()) {
-- 
2.11.0