Remove internal_include directory path from build files

Bug: 315041282
Test: m .
Flag: EXEMPT, build file inclusion path removal

Change-Id: I45d8e52ae5049b0701d4104ca19174cda8ec8c33

30 files changed, 0 insertions, 52 deletions

diff --git a/system/audio_hal_interface/BUILD.gn b/system/audio_hal_interface/BUILD.gn
index 7c250ab864..93f3de5c7e 100644
--- a/system/audio_hal_interface/BUILD.gn
+++ b/system/audio_hal_interface/BUILD.gn
@@ -24,7 +24,6 @@ static_library("audio_hal_interface") {
   include_dirs = [
     "//bt/system/bta/include",
     "//bt/system/btif/include",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/gd/rust/shim",
   ]
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 41922be7f4..d1e2d1370d 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -23,7 +23,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/btif/avrcp",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/udrv/include",
diff --git a/system/bta/BUILD.gn b/system/bta/BUILD.gn
index f2b16d3066..429a61198d 100644
--- a/system/bta/BUILD.gn
+++ b/system/bta/BUILD.gn
@@ -140,8 +140,6 @@ static_library("bta") {
     "//bt/system/linux_include",
     "//bt/system/bta",
     "//bt/system/gd",
-    "//bt/system/internal_include",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/stack/btm",
     "//bt/system/udrv/include",
@@ -225,7 +223,6 @@ if (use.test) {
       "include",
       "//bt/system/",
       "//bt/system/bta",
-      "//bt/system/internal_include",
       "//bt/system/stack/btm",
     ]
 
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 2ba26baf00..9fb04855ac 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -14,7 +14,6 @@ btifCommonIncludes = [
     "packages/modules/Bluetooth/system/btif/include",
     "packages/modules/Bluetooth/system/gd",
     "packages/modules/Bluetooth/system/include",
-    "packages/modules/Bluetooth/system/internal_include",
     "packages/modules/Bluetooth/system/stack/include",
 ]
 
diff --git a/system/btif/BUILD.gn b/system/btif/BUILD.gn
index 466ef9476e..c14c1dc371 100644
--- a/system/btif/BUILD.gn
+++ b/system/btif/BUILD.gn
@@ -106,7 +106,6 @@ static_library("btif") {
     "//bt/system/stack/btm",
     "//bt/system/stack/l2cap",
     "//bt/system/stack/include",
-    "//bt/system/internal_include",
     "//bt/system/udrv/include",
     "//bt/system/vnd/include",
     "//bt/system/profile/avrcp",
diff --git a/system/common/BUILD.gn b/system/common/BUILD.gn
index b3cb62992a..f5afaf2699 100644
--- a/system/common/BUILD.gn
+++ b/system/common/BUILD.gn
@@ -30,7 +30,6 @@ static_library("common") {
     "//bt/system/",
     "//bt/system/stack/include",
     "//bt/system/linux_include",
-    "//bt/system/internal_include",
   ]
 
   deps = [
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 5b6216d183..5e090e6c36 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -18,7 +18,6 @@ cc_library_static {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
diff --git a/system/device/BUILD.gn b/system/device/BUILD.gn
index 8b1ffd45d0..554ef3c51a 100644
--- a/system/device/BUILD.gn
+++ b/system/device/BUILD.gn
@@ -25,7 +25,6 @@ static_library("device") {
 
   include_dirs = [
     "//bt/system/",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
   ]
 
diff --git a/system/embdrv/sbc/BUILD.gn b/system/embdrv/sbc/BUILD.gn
index 061cd81382..4b31762bab 100644
--- a/system/embdrv/sbc/BUILD.gn
+++ b/system/embdrv/sbc/BUILD.gn
@@ -51,7 +51,6 @@ source_set("sbc_encoder") {
 
   include_dirs = [
     "encoder/include",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
   ]
 
diff --git a/system/embdrv/sbc/encoder/Android.bp b/system/embdrv/sbc/encoder/Android.bp
index e114066489..5a4cc5d80c 100644
--- a/system/embdrv/sbc/encoder/Android.bp
+++ b/system/embdrv/sbc/encoder/Android.bp
@@ -26,7 +26,6 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     host_supported: true,
diff --git a/system/gd/l2cap/fuzz/Android.bp b/system/gd/l2cap/fuzz/Android.bp
index 7cd46ce4fc..7bcbfb7463 100644
--- a/system/gd/l2cap/fuzz/Android.bp
+++ b/system/gd/l2cap/fuzz/Android.bp
@@ -21,7 +21,6 @@ cc_fuzz {
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/a2dp",
         "packages/modules/Bluetooth/system/stack/avdt",
         "packages/modules/Bluetooth/system/stack/btm",
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 8137d261be..bc87af1234 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -26,7 +26,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "system/libhwbinder/include",
     ],
@@ -54,7 +53,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/osi/test",
         "packages/modules/Bluetooth/system/stack/include",
         "system/libhwbinder/include",
diff --git a/system/hci/BUILD.gn b/system/hci/BUILD.gn
index ebea9e6507..4309549965 100644
--- a/system/hci/BUILD.gn
+++ b/system/hci/BUILD.gn
@@ -23,7 +23,6 @@ static_library("hci") {
   include_dirs = [
     "include",
     "//bt/system/",
-    "//bt/system/internal_include",
     "//bt/system/bta/include",
     "//bt/system/stack/include",
   ]
@@ -45,7 +44,6 @@ if (use.test) {
 
     include_dirs = [
       "//bt/system/",
-      "//bt/system/internal_include",
       "//bt/system/osi/test",
       "//bt/system/stack/include",
     ]
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 3242b15507..3bef984e96 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -36,7 +36,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/a2dp",
         "packages/modules/Bluetooth/system/stack/avdt",
         "packages/modules/Bluetooth/system/stack/btm",
@@ -83,7 +82,6 @@ cc_library {
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/a2dp",
         "packages/modules/Bluetooth/system/stack/avdt",
         "packages/modules/Bluetooth/system/stack/btm",
@@ -136,7 +134,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     generated_headers: [
diff --git a/system/main/BUILD.gn b/system/main/BUILD.gn
index b71e538c1d..6ae221d78a 100644
--- a/system/main/BUILD.gn
+++ b/system/main/BUILD.gn
@@ -58,7 +58,6 @@ target(lib_type, "bluetooth") {
     "//bt/system/bta/include",
     "//bt/system/bta/sys",
     "//bt/system/bta/dm",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/stack/l2cap",
     "//bt/system/stack/a2dp",
diff --git a/system/main/shim/BUILD.gn b/system/main/shim/BUILD.gn
index fb6ba62a01..6529f1bd94 100644
--- a/system/main/shim/BUILD.gn
+++ b/system/main/shim/BUILD.gn
@@ -42,7 +42,6 @@ source_set("LibBluetoothShimSources") {
     "//bt/system/btif/include",
     "//bt/system/gd",
     "//bt/system/gd/rust/shim",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/types",
   ]
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 01ff6c3bb6..33feacea61 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -14,7 +14,6 @@ cc_defaults {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
 }
diff --git a/system/osi/BUILD.gn b/system/osi/BUILD.gn
index 730c1edca2..1c035064ce 100644
--- a/system/osi/BUILD.gn
+++ b/system/osi/BUILD.gn
@@ -45,7 +45,6 @@ static_library("osi") {
 
   include_dirs = [
     "//bt/system/",
-    "//bt/system/internal_include",
     "//bt/system/linux_include",
     "//bt/system/osi/include_internal",
     "//bt/system/stack/include",
diff --git a/system/packet/BUILD.gn b/system/packet/BUILD.gn
index 5a1145656f..3a4dc5ca48 100644
--- a/system/packet/BUILD.gn
+++ b/system/packet/BUILD.gn
@@ -18,7 +18,6 @@ config("packet_config") {
   include_dirs = [
     "//bt/system/",
     "//bt/system/include",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/profile/avrcp",
   ]
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 34e3d1df48..5d3c58e48f 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -16,7 +16,6 @@ cc_library_static {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     export_include_dirs: ["./"],
@@ -58,7 +57,6 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
@@ -106,7 +104,6 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/stack/include",
     ],
diff --git a/system/profile/avrcp/BUILD.gn b/system/profile/avrcp/BUILD.gn
index 4341af7d38..6a8cbbe3e3 100644
--- a/system/profile/avrcp/BUILD.gn
+++ b/system/profile/avrcp/BUILD.gn
@@ -17,7 +17,6 @@
 config("avrcp_config") {
   include_dirs = [
     "//bt/system/",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
     "//bt/system/profile/avrcp",
     "//bt/system/packet",
diff --git a/system/rust/Android.bp b/system/rust/Android.bp
index 925ec1bd3e..e5314089f0 100644
--- a/system/rust/Android.bp
+++ b/system/rust/Android.bp
@@ -119,7 +119,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/types",
     ],
diff --git a/system/rust/BUILD.gn b/system/rust/BUILD.gn
index bc6e7912a5..48b94a5286 100644
--- a/system/rust/BUILD.gn
+++ b/system/rust/BUILD.gn
@@ -32,7 +32,6 @@ static_library("core_rs") {
     "//bt/system/rust",
     "//bt/system/include",
     "//bt/system/stack/include",
-    "//bt/system/internal_include",
     "//bt/system/gd",
     "//bt/system/types",
   ]
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 37088daaf4..997a2cee2d 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -16,7 +16,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/types",
     ],
@@ -72,7 +71,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/device/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/gd/hal",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/udrv/include",
     ],
     generated_headers: [
@@ -205,7 +203,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/udrv/include",
     ],
     srcs: [
@@ -332,7 +329,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/test/common",
         "packages/modules/Bluetooth/system/types",
@@ -660,7 +656,6 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
         "test/gatt/gatt_api_test.cc",
@@ -747,7 +742,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/gd/hal",
-        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
         ":TestCommonMockFunctions",
@@ -832,7 +826,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
         ":TestCommonMainHandler",
@@ -937,7 +930,6 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
         ":TestCommonMainHandler",
@@ -1397,7 +1389,6 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
         ":TestCommonMainHandler",
@@ -2042,7 +2033,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/device/include/",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/btm",
     ],
     srcs: [
diff --git a/system/stack/BUILD.gn b/system/stack/BUILD.gn
index ab89cd1a88..2afc347755 100644
--- a/system/stack/BUILD.gn
+++ b/system/stack/BUILD.gn
@@ -34,7 +34,6 @@ source_set("nonstandard_codecs") {
       "//bt/system/bta/include",
       "//bt/system/btif/include",
       "//bt/system/include",
-      "//bt/system/internal_include",
       "//bt/system/stack",
       "//bt/system/stack/include",
       "//bt/system/utils/include",
@@ -208,7 +207,6 @@ source_set("stack") {
     "//bt/system/ctrlr/include",
     "//bt/system/gd",
     "//bt/system/hcis",
-    "//bt/system/internal_include",
     "//bt/system/linux_include",
     "//bt/system/rpc/include",
     "//bt/system/types",
@@ -246,7 +244,6 @@ if (use.test) {
       "btm",
       "include",
       "test/common",
-      "//bt/system/internal_include",
       "//bt/system/packet/tests",
     ]
 
@@ -276,7 +273,6 @@ if (defined(use.android) && use.android) {
       "//bt/system/bta/include",
       "//bt/system/bta/sys",
       "//bt/system/embdrv/sbc/encoder/include",
-      "//bt/system/internal_include",
       "//bt/system/stack/a2dp",
       "//bt/system/stack/btm",
       "//bt/system/stack/include",
@@ -326,11 +322,9 @@ if (defined(use.android) && use.android) {
     include_dirs = [
       "//bt/system/",
       "//bt/system/linux_include",
-      "//bt/system/internal_include",
       "//bt/system/bta/include",
       "//bt/system/bta/sys",
       "//bt/system/embdrv/sbc/encoder/include",
-      "//bt/system/internal_include",
       "//bt/system/stack/a2dp",
       "//bt/system/stack/l2cap",
       "//bt/system/stack/btm",
diff --git a/system/stack/mmc/codec_server/BUILD.gn b/system/stack/mmc/codec_server/BUILD.gn
index ed575ed3e8..0493f7d2cd 100644
--- a/system/stack/mmc/codec_server/BUILD.gn
+++ b/system/stack/mmc/codec_server/BUILD.gn
@@ -22,7 +22,6 @@ source_set("libcodec_server_a2dp_aac") {
   include_dirs = [
     "//bt/system",
     "//bt/system/include",
-    "//bt/system/internal_include",
     "//bt/system/stack",
     "//bt/system/stack/include",
   ]
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index a139dfb488..1373e9ad8a 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -17,7 +17,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/gd/",
         "packages/modules/Bluetooth/system/include/",
-        "packages/modules/Bluetooth/system/internal_include/",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/test",
         "packages/modules/Bluetooth/system/types/",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 5f39b49952..2bc2794552 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -25,7 +25,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/a2dp",
         "packages/modules/Bluetooth/system/stack/avdt",
         "packages/modules/Bluetooth/system/stack/btm",
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index 2f89f47296..dee3f082f8 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -16,7 +16,6 @@ cc_library_static {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     local_include_dirs: [
diff --git a/system/udrv/BUILD.gn b/system/udrv/BUILD.gn
index 849f260d8d..05561b89e2 100644
--- a/system/udrv/BUILD.gn
+++ b/system/udrv/BUILD.gn
@@ -23,7 +23,6 @@ source_set("udrv") {
     "include",
     "uipc",
     "//bt/system/",
-    "//bt/system/internal_include",
     "//bt/system/stack/include",
   ]