diff options
| author | Yiwei Zhang <zzyiwei@google.com> | 2018-04-05 00:13:06 -0700 |
|---|---|---|
| committer | Yiwei Zhang <zzyiwei@google.com> | 2018-04-05 10:05:37 -0700 |
| commit | 990c4d510781b97981036e26f6d7b8d10c152e29 (patch) | |
| tree | 65365ec1e6211aabb1bd09288ee89edbb7f9b8f5 | |
| parent | fd98488524443e64b425317bdb8d96ed9000e924 (diff) | |
| download | vulkan-validation-layers-990c4d510781b97981036e26f6d7b8d10c152e29.tar.gz | |
Move vkjson out from external/LVL
LVL upstream will re-organize the folders here and will get rid of
vkjson in LVL. Thus need to move vkjson to somewhere else to accommodate
changes in LVL upstream.
Test: adb shell cmd gpu vkjson
Bug: b/77613206
Change-Id: I68e5112da7a2eac78452ab3c2c56230fcd3c943f
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | libs/vkjson/Android.bp | 52 |
2 files changed, 0 insertions, 53 deletions
diff --git a/Android.bp b/Android.bp index e95bc5d51..c1f0207b7 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,3 @@ subdirs = [ "libs/cjson", - "libs/vkjson", ] diff --git a/libs/vkjson/Android.bp b/libs/vkjson/Android.bp deleted file mode 100644 index 1b32e7ab0..000000000 --- a/libs/vkjson/Android.bp +++ /dev/null @@ -1,52 +0,0 @@ -cc_library_static { - name: "libvkjson", - srcs: [ - "vkjson.cc", - "vkjson_instance.cc", - ], - cflags: [ - "-Wall", - "-Werror", - ], - cppflags: [ - "-std=c++11", - "-Wno-sign-compare", - ], - export_include_dirs: [ - ".", - ], - whole_static_libs: [ - "cjson", - ], - header_libs: [ - "vulkan_headers", - ], -} - -cc_library_static { - name: "libvkjson_ndk", - clang: true, - srcs: [ - "vkjson.cc", - "vkjson_instance.cc", - ], - cflags: [ - "-Wall", - "-Werror", - ], - cppflags: [ - "-std=c++11", - "-Wno-sign-compare", - ], - export_include_dirs: [ - ".", - ], - whole_static_libs: [ - "cjson_ndk", - ], - header_libs: [ - "vulkan_headers_ndk", - ], - sdk_version: "24", - stl: "libc++_static", -} |