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

Commit 54409a31 authored by Steven Moreland's avatar Steven Moreland
Browse files

Make vulkan 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 vulkan with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: I9690635e4654e053cf35a3941aff14f4f7b46491
parent 3da6f353

vulkan/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -25,8 +25,16 @@ ndk_headers { 


cc_library_headers {

    name: "vulkan_headers",

    export_include_dirs: ["include"],

    vendor_available: true,

    header_libs: [

        "libcutils_headers",

        "libhardware_headers",

    ],

    export_header_lib_headers: [

        "libcutils_headers",

        "libhardware_headers",

    ],

    export_include_dirs: ["include"],

}



subdirs = [

vulkan/nulldrv/null_driver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
#include <inttypes.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include <algorithm>

#include <array>



#include <log/log.h>

#include <utils/Errors.h>



#include "null_driver_gen.h"