diff options
| -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 { |