Merge "Remove gd include from fluoride_common_options"

11 files changed, 43 insertions, 4 deletions

diff --git a/system/build/Android.bp b/system/build/Android.bp
index 1c806f37b2..48d3e87b6d 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -16,9 +16,6 @@ cc_defaults {
         // there are too many unused parameters in all the code.
         "-Wno-unused-parameter",
     ],
-    include_dirs: [
-        "packages/modules/Bluetooth/system/gd",
-    ],
 }
 
 // Fuzzable defaults are the subset of defaults that are used in fuzzing, which
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 5ab4a2cbc0..59b7a3d9b4 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -70,6 +70,7 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/device/src",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
diff --git a/system/gd/rust/stack/Android.bp b/system/gd/rust/stack/Android.bp
index 05c77022b5..5dda72d958 100644
--- a/system/gd/rust/stack/Android.bp
+++ b/system/gd/rust/stack/Android.bp
@@ -107,7 +107,10 @@ cc_library_static {
     ],
     srcs: ["src/hal/ffi/hidl.cc"],
     local_include_dirs: ["src/hal/ffi"],
-    include_dirs: ["packages/modules/Bluetooth/system"],
+    include_dirs: [
+        "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
+    ],
     generated_headers: [
         "cxx-bridge-header",
         "libbt_hidl_hal_bridge_header",
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 7b4bce1e47..6ef0bc586c 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -40,6 +40,7 @@ cc_test {
     local_include_dirs: ["tests"],
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
     ],
     srcs: [
diff --git a/system/packet/avrcp/Android.bp b/system/packet/avrcp/Android.bp
index 265d63b174..d17c276f2f 100644
--- a/system/packet/avrcp/Android.bp
+++ b/system/packet/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/include",
     ],
     srcs: [
diff --git a/system/packet/tests/fuzzers/Android.bp b/system/packet/tests/fuzzers/Android.bp
index a1f24ac94d..0d075503dc 100644
--- a/system/packet/tests/fuzzers/Android.bp
+++ b/system/packet/tests/fuzzers/Android.bp
@@ -14,6 +14,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -47,6 +48,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -81,6 +83,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -115,6 +118,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -149,6 +153,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -183,6 +188,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -217,6 +223,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -251,6 +258,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -285,6 +293,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -319,6 +328,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -353,6 +363,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -387,6 +398,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -421,6 +433,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -455,6 +468,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -489,6 +503,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -523,6 +538,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -557,6 +573,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -591,6 +608,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -625,6 +643,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -659,6 +678,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -693,6 +713,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -727,6 +748,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -761,6 +783,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -795,6 +818,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
@@ -829,6 +853,7 @@ cc_fuzz {
 
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 54a9e23299..8bb0912c73 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -56,6 +56,7 @@ 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",
     ],
@@ -95,6 +96,7 @@ 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/sdp/Android.bp b/system/profile/sdp/Android.bp
index b9efc1600c..d524ce7ca6 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -15,6 +15,7 @@ cc_library_static {
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
     ],
     srcs: [
         "common/data_element_reader.cc",
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index e7494bd186..822bc50312 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/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/internal_include/",
         "packages/modules/Bluetooth/system/stack/include",
diff --git a/system/test/rootcanal/Android.bp b/system/test/rootcanal/Android.bp
index d102002005..7145768ec8 100644
--- a/system/test/rootcanal/Android.bp
+++ b/system/test/rootcanal/Android.bp
@@ -65,6 +65,7 @@ cc_binary {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
@@ -110,6 +111,7 @@ cc_library_shared {
     ],
     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/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index d50bccdfe7..6c020b28fd 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -126,6 +126,7 @@ cc_library_static {
     static_libs: [
         "libscriptedbeaconpayload-protos-lite",
     ],
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
 }
 
 // This library contains the generated headers for the
@@ -179,6 +180,7 @@ cc_library_host_shared {
     cflags: [
         "-fexceptions",
     ],
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
 }
 
 // Generate the python parser+serializer backend for
@@ -292,6 +294,7 @@ cc_test_host {
     static_libs: [
         "libbt-rootcanal",
     ],
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
 }
 
 // Implement the Bluetooth official LL test suite for root-canal.
@@ -363,6 +366,7 @@ cc_test_host {
             enabled: false,
         },
     },
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
 }
 
 // Linux RootCanal Executable
@@ -408,6 +412,7 @@ cc_binary_host {
             enabled: false,
         },
     },
+    include_dirs: ["packages/modules/Bluetooth/system/gd"],
 }
 
 genrule {