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

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

Merge "Make gd exports flatbuffers headers" into main am: 07bfcc3b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2691807



Change-Id: If97b67ab52f694853ee66a3be4f052a2796297c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ce3e6a8 07bfcc3b

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ cc_library_shared { 
        "libchrome",

        "libcutils",

        "libevent",

        "libflatbuffers-cpp",

        "libfmq",

        "libg722codec",

        "libhidlbase",

system/audio_hal_interface/fuzzer/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ cc_defaults { 
        "libchrome",

        "libcutils",

        "libevent",

        "libflatbuffers-cpp",

        "libg722codec",

        "libhidlbase",

        "libjsoncpp",

system/bta/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ cc_test { 
        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],

    sanitize: {

system/btif/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libchrome",

        "libflatbuffers-cpp",

        "libosi",

    ],

    cflags: ["-DBUILDCFG"],
@@ -381,7 +380,6 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libchrome",

        "libflatbuffers-cpp",

        "libosi",

    ],

    cflags: ["-DBUILDCFG"],
@@ -611,7 +609,6 @@ cc_test { 
        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],

    cflags: ["-DBUILDCFG"],
@@ -743,7 +740,6 @@ cc_test { 
        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],

    cflags: ["-DBUILDCFG"],

system/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ cc_defaults { 
        "fluoride_defaults",

    ],

    static_libs: [

        "libflatbuffers-cpp",

        "libprotobuf-cpp-lite",

    ],

}