From 9e9eb4b97933b64451d45b39984e875de1cc8501 Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Tue, 17 Oct 2017 16:40:41 -0700
Subject: [PATCH] Move include->internal_include (1/2)
Change-Id: If351c7d51a380c33ec9bae3b3f240ed53639f3c9
---
system/bta/Android.bp | 2 +-
system/btif/Android.bp | 2 +-
system/btif/src/btif_debug.cc | 2 +-
system/btif/src/btif_debug_btsnoop.cc | 2 +-
system/btif/src/btif_dm.cc | 2 +-
system/device/Android.bp | 2 +-
system/embdrv/sbc/encoder/Android.bp | 2 +-
system/hci/Android.bp | 4 ++--
system/{include => internal_include}/bt_common.h | 0
system/{include => internal_include}/bt_target.h | 0
system/{include => internal_include}/bt_trace.h | 0
system/{include => internal_include}/bte.h | 0
system/{include => internal_include}/bte_appl.h | 0
system/{include => internal_include}/stack_config.h | 0
system/main/Android.bp | 2 +-
system/osi/Android.bp | 2 +-
system/osi/src/alarm.cc | 2 +-
system/stack/Android.bp | 12 ++++++------
system/stack/smp/smp_act.cc | 2 +-
system/test/rootcanal/Android.bp | 4 ++--
system/tools/mcap_tool/Android.bp | 2 +-
system/udrv/Android.bp | 2 +-
system/vendor_libs/test_vendor_lib/Android.bp | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
rename system/{include => internal_include}/bt_common.h (100%)
rename system/{include => internal_include}/bt_target.h (100%)
rename system/{include => internal_include}/bt_trace.h (100%)
rename system/{include => internal_include}/bte.h (100%)
rename system/{include => internal_include}/bte_appl.h (100%)
rename system/{include => internal_include}/stack_config.h (100%)
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index c87b95d1636..b434799a1ab 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -13,7 +13,7 @@ cc_defaults {
"packages/modules/Bluetooth/system/bta/include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/stack/btm",
"packages/modules/Bluetooth/system/udrv/include",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 9471486d598..b31dd1b8fef 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -7,7 +7,7 @@ btifCommonIncludes = [
"packages/modules/Bluetooth/system/bta/dm",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/device/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/stack/l2cap",
"packages/modules/Bluetooth/system/stack/a2dp",
diff --git a/system/btif/src/btif_debug.cc b/system/btif/src/btif_debug.cc
index a26c30130b8..43735316b0f 100644
--- a/system/btif/src/btif_debug.cc
+++ b/system/btif/src/btif_debug.cc
@@ -21,7 +21,7 @@
#include "btif/include/btif_debug.h"
#include "btif/include/btif_debug_btsnoop.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
void btif_debug_init(void) {
#if (BTSNOOP_MEM == TRUE)
diff --git a/system/btif/src/btif_debug_btsnoop.cc b/system/btif/src/btif_debug_btsnoop.cc
index 668240c6d43..6ea7f3977b7 100644
--- a/system/btif/src/btif_debug_btsnoop.cc
+++ b/system/btif/src/btif_debug_btsnoop.cc
@@ -25,7 +25,7 @@
#include "btif/include/btif_debug.h"
#include "btif/include/btif_debug_btsnoop.h"
#include "hci/include/btsnoop_mem.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
#include "osi/include/ringbuffer.h"
#include "osi/include/time.h"
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 888f032dda7..55a7c111e4f 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -59,7 +59,7 @@
#include "btu.h"
#include "device/include/controller.h"
#include "device/include/interop.h"
-#include "include/stack_config.h"
+#include "internal_include/stack_config.h"
#include "osi/include/allocator.h"
#include "osi/include/log.h"
#include "osi/include/metrics.h"
diff --git a/system/device/Android.bp b/system/device/Android.bp
index a1c90bef59d..60e9fef306f 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -10,7 +10,7 @@ cc_library_static {
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
],
srcs: [
diff --git a/system/embdrv/sbc/encoder/Android.bp b/system/embdrv/sbc/encoder/Android.bp
index edbebe98eb7..2556fcb07d6 100644
--- a/system/embdrv/sbc/encoder/Android.bp
+++ b/system/embdrv/sbc/encoder/Android.bp
@@ -17,7 +17,7 @@ cc_library_static {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
],
}
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 8d51a9dd92f..9c9e70ce1c0 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -31,7 +31,7 @@ cc_library_static {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/utils/include",
@@ -51,7 +51,7 @@ cc_test {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/osi/test",
"packages/modules/Bluetooth/system/stack/include",
diff --git a/system/include/bt_common.h b/system/internal_include/bt_common.h
similarity index 100%
rename from system/include/bt_common.h
rename to system/internal_include/bt_common.h
diff --git a/system/include/bt_target.h b/system/internal_include/bt_target.h
similarity index 100%
rename from system/include/bt_target.h
rename to system/internal_include/bt_target.h
diff --git a/system/include/bt_trace.h b/system/internal_include/bt_trace.h
similarity index 100%
rename from system/include/bt_trace.h
rename to system/internal_include/bt_trace.h
diff --git a/system/include/bte.h b/system/internal_include/bte.h
similarity index 100%
rename from system/include/bte.h
rename to system/internal_include/bte.h
diff --git a/system/include/bte_appl.h b/system/internal_include/bte_appl.h
similarity index 100%
rename from system/include/bte_appl.h
rename to system/internal_include/bte_appl.h
diff --git a/system/include/stack_config.h b/system/internal_include/stack_config.h
similarity index 100%
rename from system/include/stack_config.h
rename to system/internal_include/stack_config.h
diff --git a/system/main/Android.bp b/system/main/Android.bp
index e9a6279fca6..994ea034ce7 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -19,7 +19,7 @@ cc_library_shared {
"packages/modules/Bluetooth/system/bta/sys",
"packages/modules/Bluetooth/system/bta/dm",
"packages/modules/Bluetooth/system/btcore/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/stack/l2cap",
"packages/modules/Bluetooth/system/stack/a2dp",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 16b39fe97a0..fc18d0c8f58 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -3,7 +3,7 @@ cc_defaults {
defaults: ["fluoride_defaults"],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/osi/src/protos",
"packages/modules/Bluetooth/system/utils/include",
"packages/modules/Bluetooth/system/stack/include",
diff --git a/system/osi/src/alarm.cc b/system/osi/src/alarm.cc
index e1c87fc4002..2c6db3ff178 100644
--- a/system/osi/src/alarm.cc
+++ b/system/osi/src/alarm.cc
@@ -16,7 +16,7 @@
*
******************************************************************************/
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
#define LOG_TAG "bt_osi_alarm"
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 5b63527dbd7..ebd3836e9ed 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -30,7 +30,7 @@ cc_library_static {
"packages/modules/Bluetooth/system/vnd/ble",
"packages/modules/Bluetooth/system/btif/include",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/udrv/include",
"packages/modules/Bluetooth/system/bta/include",
"packages/modules/Bluetooth/system/bta/sys",
@@ -189,7 +189,7 @@ cc_test {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
],
srcs: ["test/stack_a2dp_test.cc"],
shared_libs: [
@@ -217,7 +217,7 @@ cc_test {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/hci/include",
"packages/modules/Bluetooth/system/utils/include",
@@ -252,10 +252,10 @@ cc_test {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/utils/include",
],
srcs: [
@@ -301,7 +301,7 @@ cc_test {
],
include_dirs: [
"packages/modules/Bluetooth/system/",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/btcore/include",
"packages/modules/Bluetooth/system/bta/include",
],
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index 650330338ea..cf77b7cbf6d 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -19,7 +19,7 @@
#include <string.h>
#include "btif_common.h"
#include "device/include/interop.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
#include "stack/btm/btm_int.h"
#include "stack/include/l2c_api.h"
#include "stack/smp/smp_int.h"
diff --git a/system/test/rootcanal/Android.bp b/system/test/rootcanal/Android.bp
index 068d3066ce4..b478a25644f 100644
--- a/system/test/rootcanal/Android.bp
+++ b/system/test/rootcanal/Android.bp
@@ -50,7 +50,7 @@ cc_binary {
include_dirs: [
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
],
init_rc: ["android.hardware.bluetooth@1.0-service.sim.rc"],
@@ -90,7 +90,7 @@ cc_library_shared {
include_dirs: [
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
],
}
diff --git a/system/tools/mcap_tool/Android.bp b/system/tools/mcap_tool/Android.bp
index 5c833fd6f85..cb3b3b320ad 100644
--- a/system/tools/mcap_tool/Android.bp
+++ b/system/tools/mcap_tool/Android.bp
@@ -25,7 +25,7 @@ cc_binary {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
"packages/modules/Bluetooth/system/btcore/include",
],
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index f2d41a77882..8b2afcf1cf3 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -6,7 +6,7 @@ cc_library_static {
],
include_dirs: [
"packages/modules/Bluetooth/system",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/utils/include",
"packages/modules/Bluetooth/system/stack/include",
],
diff --git a/system/vendor_libs/test_vendor_lib/Android.bp b/system/vendor_libs/test_vendor_lib/Android.bp
index a1938b13e3d..e15f7236acd 100644
--- a/system/vendor_libs/test_vendor_lib/Android.bp
+++ b/system/vendor_libs/test_vendor_lib/Android.bp
@@ -41,7 +41,7 @@ cc_library_static {
"packages/modules/Bluetooth/system",
"packages/modules/Bluetooth/system/utils/include",
"packages/modules/Bluetooth/system/hci/include",
- "packages/modules/Bluetooth/system/include",
+ "packages/modules/Bluetooth/system/internal_include",
"packages/modules/Bluetooth/system/stack/include",
],
shared_libs: [
--
GitLab