Move include->internal_include (1/2)
Change-Id: If351c7d51a380c33ec9bae3b3f240ed53639f3c9
diff --git a/bta/Android.bp b/bta/Android.bp
index 50736de..2acbbf9 100644
--- a/bta/Android.bp
+++ b/bta/Android.bp
@@ -13,7 +13,7 @@
"system/bt/bta/include",
"system/bt/btcore/include",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
"system/bt/stack/btm",
"system/bt/udrv/include",
diff --git a/btif/Android.bp b/btif/Android.bp
index adc35be..143cbe2 100644
--- a/btif/Android.bp
+++ b/btif/Android.bp
@@ -7,7 +7,7 @@
"system/bt/bta/dm",
"system/bt/btcore/include",
"system/bt/device/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
"system/bt/stack/l2cap",
"system/bt/stack/a2dp",
diff --git a/btif/src/btif_debug.cc b/btif/src/btif_debug.cc
index a26c301..4373531 100644
--- a/btif/src/btif_debug.cc
+++ b/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/btif/src/btif_debug_btsnoop.cc b/btif/src/btif_debug_btsnoop.cc
index 668240c..6ea7f39 100644
--- a/btif/src/btif_debug_btsnoop.cc
+++ b/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/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 888f032..55a7c11 100644
--- a/btif/src/btif_dm.cc
+++ b/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/device/Android.bp b/device/Android.bp
index c113113..f72a16b 100644
--- a/device/Android.bp
+++ b/device/Android.bp
@@ -10,7 +10,7 @@
"system/bt",
"system/bt/btcore/include",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
],
srcs: [
diff --git a/embdrv/sbc/encoder/Android.bp b/embdrv/sbc/encoder/Android.bp
index 6e22f89..8ca44de 100644
--- a/embdrv/sbc/encoder/Android.bp
+++ b/embdrv/sbc/encoder/Android.bp
@@ -17,7 +17,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
],
}
diff --git a/hci/Android.bp b/hci/Android.bp
index 4edcfee..b6fe28a 100644
--- a/hci/Android.bp
+++ b/hci/Android.bp
@@ -31,7 +31,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/btcore/include",
"system/bt/stack/include",
"system/bt/utils/include",
@@ -51,7 +51,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/btcore/include",
"system/bt/osi/test",
"system/bt/stack/include",
diff --git a/include/bt_common.h b/internal_include/bt_common.h
similarity index 100%
rename from include/bt_common.h
rename to internal_include/bt_common.h
diff --git a/include/bt_target.h b/internal_include/bt_target.h
similarity index 100%
rename from include/bt_target.h
rename to internal_include/bt_target.h
diff --git a/include/bt_trace.h b/internal_include/bt_trace.h
similarity index 100%
rename from include/bt_trace.h
rename to internal_include/bt_trace.h
diff --git a/include/bte.h b/internal_include/bte.h
similarity index 100%
rename from include/bte.h
rename to internal_include/bte.h
diff --git a/include/bte_appl.h b/internal_include/bte_appl.h
similarity index 100%
rename from include/bte_appl.h
rename to internal_include/bte_appl.h
diff --git a/include/stack_config.h b/internal_include/stack_config.h
similarity index 100%
rename from include/stack_config.h
rename to internal_include/stack_config.h
diff --git a/main/Android.bp b/main/Android.bp
index f0107b4..a9bcc3d 100644
--- a/main/Android.bp
+++ b/main/Android.bp
@@ -19,7 +19,7 @@
"system/bt/bta/sys",
"system/bt/bta/dm",
"system/bt/btcore/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
"system/bt/stack/l2cap",
"system/bt/stack/a2dp",
diff --git a/osi/Android.bp b/osi/Android.bp
index da62a2f..8e5dbde 100644
--- a/osi/Android.bp
+++ b/osi/Android.bp
@@ -3,7 +3,7 @@
defaults: ["fluoride_defaults"],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/osi/src/protos",
"system/bt/utils/include",
"system/bt/stack/include",
diff --git a/osi/src/alarm.cc b/osi/src/alarm.cc
index e1c87fc..2c6db3f 100644
--- a/osi/src/alarm.cc
+++ b/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/stack/Android.bp b/stack/Android.bp
index 9748eaa..aee82f1 100644
--- a/stack/Android.bp
+++ b/stack/Android.bp
@@ -30,7 +30,7 @@
"system/bt/vnd/ble",
"system/bt/btif/include",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/udrv/include",
"system/bt/bta/include",
"system/bt/bta/sys",
@@ -189,7 +189,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
],
srcs: ["test/stack_a2dp_test.cc"],
shared_libs: [
@@ -217,7 +217,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/btcore/include",
"system/bt/hci/include",
"system/bt/utils/include",
@@ -252,10 +252,10 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/btcore/include",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/utils/include",
],
srcs: [
@@ -301,7 +301,7 @@
],
include_dirs: [
"system/bt/",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/btcore/include",
"system/bt/bta/include",
],
diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index 6503303..cf77b7c 100644
--- a/stack/smp/smp_act.cc
+++ b/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/test/rootcanal/Android.bp b/test/rootcanal/Android.bp
index e5d3ac5..997f381 100644
--- a/test/rootcanal/Android.bp
+++ b/test/rootcanal/Android.bp
@@ -50,7 +50,7 @@
include_dirs: [
"system/bt",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
],
init_rc: ["android.hardware.bluetooth@1.0-service.sim.rc"],
@@ -90,7 +90,7 @@
include_dirs: [
"system/bt",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
],
}
diff --git a/tools/mcap_tool/Android.bp b/tools/mcap_tool/Android.bp
index aca07dd..26f2b10 100644
--- a/tools/mcap_tool/Android.bp
+++ b/tools/mcap_tool/Android.bp
@@ -25,7 +25,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
"system/bt/btcore/include",
],
diff --git a/udrv/Android.bp b/udrv/Android.bp
index a571478..9bf1d83 100644
--- a/udrv/Android.bp
+++ b/udrv/Android.bp
@@ -6,7 +6,7 @@
],
include_dirs: [
"system/bt",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/utils/include",
"system/bt/stack/include",
],
diff --git a/vendor_libs/test_vendor_lib/Android.bp b/vendor_libs/test_vendor_lib/Android.bp
index 3524df4..7ff33e7 100644
--- a/vendor_libs/test_vendor_lib/Android.bp
+++ b/vendor_libs/test_vendor_lib/Android.bp
@@ -41,7 +41,7 @@
"system/bt",
"system/bt/utils/include",
"system/bt/hci/include",
- "system/bt/include",
+ "system/bt/internal_include",
"system/bt/stack/include",
],
shared_libs: [