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

Commit c350731a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove 'system/device/include' from include_dirs" into main

parents 237c0bd6 249755d6

system/btif/BUILD.gn

+0 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ static_library("btif") { 
    "//bt/system/bta/aics/include",

    "//bt/system/bta/aics/include",

    "//bt/system/bta/include",

    "//bt/system/bta/include",

    "//bt/system/bta/sys",

    "//bt/system/bta/sys",

    "//bt/system/device/include",

    "//bt/system/embdrv/sbc/encoder/include",

    "//bt/system/embdrv/sbc/encoder/include",

    "//bt/system/embdrv/sbc/decoder/include",

    "//bt/system/embdrv/sbc/decoder/include",

    "//bt/system/gd",

    "//bt/system/gd",

system/device/fuzzer/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ cc_fuzz { 
    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/device/include",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",

    ],

    ],

    fuzz_config: {

    fuzz_config: {

system/device/fuzzer/btdevice_esco_fuzzer.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <string>

#include <string>





#include "btcore/include/module.h"

#include "btcore/include/module.h"

#include "esco_parameters.h"

#include "device/include/esco_parameters.h"

#include "interop.h"

#include "device/include/interop.h"

#include "interop_config.h"

#include "device/include/interop_config.h"





// TODO(b/369381361) Enfore -Wmissing-prototypes

// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"

#pragma GCC diagnostic ignored "-Wmissing-prototypes"

system/stack/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -69,7 +69,6 @@ cc_library_static { 
        "packages/modules/Bluetooth/system/bta/include",

        "packages/modules/Bluetooth/system/bta/include",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/include",

        "packages/modules/Bluetooth/system/btif/include",

        "packages/modules/Bluetooth/system/device/include",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd/hal",

        "packages/modules/Bluetooth/system/gd/hal",

        "packages/modules/Bluetooth/system/udrv/include",

        "packages/modules/Bluetooth/system/udrv/include",
@@ -1726,7 +1725,6 @@ cc_test { 
    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/device/include",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",

    ],

    ],

    generated_headers: [

    generated_headers: [
@@ -2363,7 +2361,6 @@ cc_test { 
    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/device/include",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",

    ],

    ],

    generated_headers: [

    generated_headers: [

system/test/suite/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ cc_defaults { 
        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/avrcp",

        "packages/modules/Bluetooth/system/btif/avrcp",

        "packages/modules/Bluetooth/system/btif/co",

        "packages/modules/Bluetooth/system/btif/co",

        "packages/modules/Bluetooth/system/device/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",

        "packages/modules/Bluetooth/system/gd",

        "packages/modules/Bluetooth/system/gd",