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

Commit e1acd8fb authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "Remove 'system/types' from include_dirs" into main

parents 4b50815e 215c0198

android/app/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ cc_library_shared { 
    include_dirs: [

        "packages/modules/Bluetooth/system",

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

        "packages/modules/Bluetooth/system/types",

    ],

    // libbluetooth_jni is the jni lib included in the btservices apex.

    // As this library is inside an APEX the shared_libs that does not
@@ -182,9 +181,6 @@ cc_library { 
        "jni_headers",

        "libbluetooth_headers",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/types",

    ],

    static_libs: [

        "lib-bt-packets",

        "lib-bt-packets-base",

system/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ config("target_defaults") { 
    "//bt/flags/exported_include",

    "//bt/sysprop/exported_include",

    "//bt/system/linux_include",

    "//bt/system/types",

    "//bt/system/include",

    "//bt/system/gd",

system/audio_hearing_aid_hw/Android.bp

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

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

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

        "packages/modules/Bluetooth/system/types",

    ],

}

system/bta/le_audio/devices.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "gmap_client.h"

#include "le_audio_types.h"

#include "osi/include/alarm.h"

#include "raw_address.h"

#include "types/raw_address.h"



namespace bluetooth::le_audio {

system/bta/le_audio/le_audio_types.h

+1 −1
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ 
#include <variant>

#include <vector>



#include "bluetooth/uuid.h"

#include "bta/include/bta_le_audio_uuids.h"

#include "osi/include/alarm.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_iso_api_types.h"

#include "types/bluetooth/uuid.h"



namespace bluetooth::le_audio {