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

Commit f9a57e6a authored Apr 05, 2018 by Yiwei Zhang

Move vkjson into framework/native/vulkan

LVL upstream will re-organize the folders in external/LVL and will get
rid of vkjson. Thus need to move vkjson here to accordingly.

Test: adb shell cmd gpu vkjson
Bug: b/77613206
Change-Id: I5dac0c2c3a4e1d7dae8adda01cf4f2712a132469

parent 55d4747f

vulkan/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,5 @@ subdirs = [
		"nulldrv",
		"libvulkan",
		"tools",
		"vkjson",
		]

vulkan/vkjson/.clang-format

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		BasedOnStyle: Chromium

vulkan/vkjson/Android.bp

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		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",
		}