From: Myles Watson <mylesgw@google.com>
Date: Thu, 2 Nov 2017 21:47:20 +0000 (+0000)
Subject: Revert "btif: Simplify dependencies for btif_storage_test"
X-Git-Tag: android-x86-9.0-r1~178^2~1^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee175838920961ae7b8dba84f0dd6391767a38f6;p=android-x86%2Fsystem-bt.git

Revert "btif: Simplify dependencies for btif_storage_test"

This reverts commit c9026a03f4bf225ade0cb79e51385acb1201ba07.

Change-Id: Ie7527e8042d13cabd692a6929d902bc1efe009b6
---

diff --git a/btif/Android.bp b/btif/Android.bp
index 326ef5c0a..be85d8805 100644
--- a/btif/Android.bp
+++ b/btif/Android.bp
@@ -106,17 +106,16 @@ cc_test {
     name: "net_test_btif",
     defaults: ["fluoride_defaults"],
     include_dirs: btifCommonIncludes,
-    srcs: [
-        "test/btif_storage_test.cc",
-        "test/bogus_stack_dependency_btif_storage_test.cc",
-        ],
+    srcs: ["test/btif_storage_test.cc"],
     header_libs: ["libbluetooth_headers"],
     shared_libs: [
         "liblog",
         "libcutils",
     ],
     static_libs: [
+        "libbtcore",
         "libbtif",
+        "libbt-stack",
         "libbluetooth-types",
         "libosi",
     ],
diff --git a/btif/test/bogus_stack_dependency_btif_storage_test.cc b/btif/test/bogus_stack_dependency_btif_storage_test.cc
deleted file mode 100644
index 2fc825935..000000000
--- a/btif/test/bogus_stack_dependency_btif_storage_test.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Copyright 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// b/68350333 dependency
-#include "stack/include/a2dp_codec_api.h"
-
-A2dpCodecs::~A2dpCodecs() {}