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

Commit 515727b1 authored by Steven Moreland's avatar Steven Moreland Committed by Jakub Pawlowski
Browse files

Make system/bt build with the VNDK. 

When the vndk is enabled (BOARD_VNDK_VERSION=current),
vendor libraries must only link against vendor variants
in the build system. This also means that they receive
restricted sets of headers and that automatic global
headers are restricted.

Test: build system/bt with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: Ie1507e9b5bdb626fa0049faadd225c2c1f451661
Merged-In: Ie1507e9b5bdb626fa0049faadd225c2c1f451661
(cherry picked from commit 093123bf)
parent f4f1eacc

system/stack/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ cc_library_static { 
        "smp",

        "srvc",

    ],

    header_libs: [

        "libhardware_headers",

    ],

    include_dirs: [

        "external/aac/libAACenc/include",

        "external/aac/libSYS/include",

system/vendor_libs/linux/interface/h4_protocol.cc

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <android-base/logging.h>

#include <assert.h>

#include <fcntl.h>

#include <sys/uio.h>

#include <utils/Log.h>



namespace android {

system/vendor_libs/test_vendor_lib/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ cc_library_static { 
        "include",

    ],

    export_include_dirs: ["include"],

    header_libs: [

        "libhardware_headers",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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