diff options
| author | Jesse Hall <jessehall@google.com> | 2017-08-28 22:09:33 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2017-08-28 22:09:33 -0700 |
| commit | 65a553726ad6089509c9952e098d95f85d83741e (patch) | |
| tree | 3e03e0e95b7c51248792f68fcb49aa594a7efb03 | |
| parent | e3b0f1946f428991922ccd2a42eed7656a3b3a4d (diff) | |
| download | vulkan-validation-layers-65a553726ad6089509c9952e098d95f85d83741e.tar.gz | |
vkjson: Switch to system Vulkan headers
Build vkjson against the system Vulkan headers instead of the copy
included in this repository. Updating this repository would mean
merging from upstream, which is too big a change for this branch.
Instead, allow vkjson to use newer extensions by building against the
newer platform Vulkan header.
Test: build
Bug: 34745152
Change-Id: Ia143a2c8f51e94de3a83ff2b0b5b15fc34e316f8
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | libs/vkjson/Android.bp | 5 | ||||
| -rw-r--r-- | libs/vkjson/vkjson.cc | 1 |
3 files changed, 2 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp index 7c2da7992..e95bc5d51 100644 --- a/Android.bp +++ b/Android.bp @@ -1,26 +1,3 @@ -cc_library_headers { - name: "vk_headers", - clang: true, - local_include_dirs: [ - "include", - ], - export_include_dirs: [ - "include", - ], -} - -cc_library_headers { - name: "vk_headers_ndk", - clang: true, - local_include_dirs: [ - "include", - ], - export_include_dirs: [ - "include", - ], - sdk_version: "24", -} - subdirs = [ "libs/cjson", "libs/vkjson", diff --git a/libs/vkjson/Android.bp b/libs/vkjson/Android.bp index 63de5c1ef..d50c149de 100644 --- a/libs/vkjson/Android.bp +++ b/libs/vkjson/Android.bp @@ -1,6 +1,5 @@ cc_library_static { name: "libvkjson", - clang: true, srcs: [ "vkjson.cc", "vkjson_instance.cc", @@ -16,7 +15,7 @@ cc_library_static { "cjson", ], header_libs: [ - "vk_headers", + "vulkan_headers", ], } @@ -38,7 +37,7 @@ cc_library_static { "cjson_ndk", ], header_libs: [ - "vk_headers_ndk", + "vulkan_headers_ndk", ], sdk_version: "24", stl: "libc++_static", diff --git a/libs/vkjson/vkjson.cc b/libs/vkjson/vkjson.cc index aa3719d5f..4eed94569 100644 --- a/libs/vkjson/vkjson.cc +++ b/libs/vkjson/vkjson.cc @@ -33,7 +33,6 @@ #include <utility> #include <cJSON.h> -#include <vulkan/vk_sdk_platform.h> namespace { |