Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ccc3655 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Remove gd include from fluoride_common_options" am: 1d593c30

parents 906c59b0 1d593c30
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -16,9 +16,6 @@ cc_defaults {
        // there are too many unused parameters in all the code.
        // there are too many unused parameters in all the code.
        "-Wno-unused-parameter",
        "-Wno-unused-parameter",
    ],
    ],
    include_dirs: [
        "packages/modules/Bluetooth/system/gd",
    ],
}
}


// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ cc_test {
    include_dirs: [
    include_dirs: [
        "packages/modules/Bluetooth/system",
        "packages/modules/Bluetooth/system",
        "packages/modules/Bluetooth/system/device/src",
        "packages/modules/Bluetooth/system/device/src",
        "packages/modules/Bluetooth/system/gd",
        "packages/modules/Bluetooth/system/stack/include",
        "packages/modules/Bluetooth/system/stack/include",
    ],
    ],
    srcs: [
    srcs: [
+4 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,10 @@ cc_library_static {
    ],
    ],
    srcs: ["src/hal/ffi/hidl.cc"],
    srcs: ["src/hal/ffi/hidl.cc"],
    local_include_dirs: ["src/hal/ffi"],
    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: [
    generated_headers: [
        "cxx-bridge-header",
        "cxx-bridge-header",
        "libbt_hidl_hal_bridge_header",
        "libbt_hidl_hal_bridge_header",
+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ cc_test {
    local_include_dirs: ["tests"],
    local_include_dirs: ["tests"],
    include_dirs: [
    include_dirs: [
        "packages/modules/Bluetooth/system/",
        "packages/modules/Bluetooth/system/",
        "packages/modules/Bluetooth/system/gd",
        "packages/modules/Bluetooth/system/include",
        "packages/modules/Bluetooth/system/include",
    ],
    ],
    srcs: [
    srcs: [
+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ cc_library_static {
    host_supported: true,
    host_supported: true,
    include_dirs: [
    include_dirs: [
        "packages/modules/Bluetooth/system/",
        "packages/modules/Bluetooth/system/",
        "packages/modules/Bluetooth/system/gd",
        "packages/modules/Bluetooth/system/include",
        "packages/modules/Bluetooth/system/include",
    ],
    ],
    srcs: [
    srcs: [
Loading