Promote gd/ to first class include directory

Bug: 190631642
Test: gd/cert/run
Tag: #refactor

Change-Id: Ib19e95498334f2835e5a2528ed37d0c0557154e3

system/audio_a2dp_hw/Android.bp

@@ -12,6 +12,7 @@ cc_defaults {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/audio_a2dp_hw/include",
     ],

system/audio_hal_interface/Android.bp

@@ -13,6 +13,7 @@ cc_library_static {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/include",
@@ -60,6 +61,7 @@ cc_test {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [

system/audio_hearing_aid_hw/Android.bp

@@ -12,6 +12,7 @@ cc_defaults {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
     ],
 }
 

system/bta/Android.bp

@@ -23,6 +23,7 @@ cc_defaults {
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/btif/avrcp",
         "packages/modules/Bluetooth/system/btif/include",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/hci/include",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
@@ -218,6 +219,7 @@ cc_test {
     test_suites: ["device-tests"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/include",

system/btcore/Android.bp

@@ -12,7 +12,10 @@ cc_library_static {
     name: "libbtcore",
     defaults: ["fluoride_defaults"],
     local_include_dirs: ["include"],
-    include_dirs: ["packages/modules/Bluetooth/system"],
+    include_dirs: [
+        "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
+    ],
     srcs: [
         "src/device_class.cc",
         "src/hal_util.cc",

system/btif/Android.bp

@@ -20,6 +20,7 @@ btifCommonIncludes = [
     "packages/modules/Bluetooth/system/device/include",
     "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/hci/include",
     "packages/modules/Bluetooth/system/include",
     "packages/modules/Bluetooth/system/internal_include",
@@ -100,12 +101,18 @@ cc_library_static {
         "src/btif_keystore.cc",
         "src/stack_manager.cc",
     ],
+    generated_headers: [
+        "BluetoothGeneratedBundlerSchema_h_bfbs",
+        "BluetoothGeneratedDumpsysDataSchema_h",
+        "BluetoothGeneratedPackets_h",
+    ],
     shared_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
         "libcrypto",
         "libcutils",
+        "libflatbuffers-cpp",
         "libhidlbase",
         "liblog",
         "libtinyxml2",
@@ -202,9 +209,15 @@ cc_test {
         "test/btif_profile_queue_test.cc",
     ],
     header_libs: ["libbluetooth_headers"],
+    generated_headers: [
+        "BluetoothGeneratedBundlerSchema_h_bfbs",
+        "BluetoothGeneratedDumpsysDataSchema_h",
+        "BluetoothGeneratedPackets_h",
+    ],
     shared_libs: [
-        "liblog",
         "libcutils",
+        "libflatbuffers-cpp",
+        "liblog",
     ],
     static_libs: [
         "libbluetooth-types",

system/common/Android.bp

@@ -16,6 +16,7 @@ cc_library_static {
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/gd/rust/shim",
     ],
@@ -51,6 +52,7 @@ cc_test {
     },
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/gd/rust/shim",
     ],

system/device/Android.bp

@@ -17,6 +17,7 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
         "packages/modules/Bluetooth/system/internal_include",

system/gd/Android.bp

@@ -454,6 +454,7 @@ cc_test {
         "gd_defaults",
         "gd_clang_coverage_bin",
     ],
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
     host_supported: true,
     test_options: {
         unit_test: true,
@@ -472,6 +473,7 @@ cc_test {
     },
     static_libs: [
         "libchrome",
+        "libbluetooth_rust_interop",
     ],
     shared_libs: [
         "libgrpc++",

system/gd/rust/shim/Android.bp

@@ -73,6 +73,9 @@ cc_library_static {
         "libbt_message_loop_thread_bridge_header",
         "cxx-bridge-header",
     ],
+    include_dirs: [
+        "packages/modules/Bluetooth/system/gd",
+    ],
     header_libs: ["libbt_callbacks_cxx_headers"],
     export_header_lib_headers: ["libbt_callbacks_cxx_headers"],
     cflags: [

system/hci/Android.bp

@@ -38,6 +38,7 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/stack/include",
@@ -106,6 +107,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
@@ -140,6 +142,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/osi/test",

system/osi/Android.bp

@@ -13,6 +13,7 @@ cc_defaults {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/utils/include",
         "packages/modules/Bluetooth/system/stack/include",

system/profile/avrcp/Android.bp

@@ -16,6 +16,7 @@ cc_library_static {
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",

system/service/Android.bp

@@ -16,6 +16,7 @@ cc_defaults {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
     ],
     header_libs: ["libbluetooth_headers"],
 }

system/stack/Android.bp

@@ -56,6 +56,7 @@ cc_library_static {
         "external/libldac/inc",
         "external/libldac/abr/inc",
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/vnd/include",
         "packages/modules/Bluetooth/system/vnd/ble",
@@ -225,6 +226,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: [
@@ -290,6 +292,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
@@ -345,6 +348,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
@@ -383,6 +387,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
@@ -434,6 +439,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
@@ -467,6 +473,7 @@ cc_test {
     },
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/eatt",
         "packages/modules/Bluetooth/system/stack/l2cap",
@@ -511,6 +518,7 @@ cc_test {
     include_dirs: [
         "external/libldac/inc",
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/utils/include",
     ],
@@ -561,6 +569,7 @@ cc_test {
     include_dirs: [
         "external/libldac/inc",
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
@@ -594,6 +603,7 @@ cc_test {
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/eatt",
         "packages/modules/Bluetooth/system/stack/include",
@@ -639,6 +649,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
     ],
     srcs: [
@@ -688,12 +699,13 @@ cc_test {
     ],
     include_dirs:[
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
     ],
     srcs: [
         "eatt/eatt.cc",
         "test/common/mock_btm_api_layer.cc",
-	"test/common/mock_btif_storage.cc",
+        "test/common/mock_btif_storage.cc",
         "test/common/mock_controller.cc",
         "test/common/mock_gatt_layer.cc",
         "test/common/mock_l2cap_layer.cc",
@@ -818,6 +830,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/vnd/ble",
     ],
     srcs: crypto_toolbox_srcs + [
@@ -859,6 +872,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
     ],
     srcs: crypto_toolbox_srcs + [
         ":TestStackL2cap",

system/stack/test/fuzzers/a2dp/codec/Android.bp

@@ -13,6 +13,7 @@ cc_defaults {
     include_dirs: [
         "packages/modules/Bluetooth/system/bta/include/", // For tBT_A2DP_OFFLOAD
         "packages/modules/Bluetooth/system/bta/sys/", // For tBT_A2DP_OFFLOAD
+        "packages/modules/Bluetooth/system/gd",
     ],
 }
 

system/utils/Android.bp

@@ -16,6 +16,7 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/stack/include",
     ],