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

Commit 92b85521 authored Apr 06, 2018 by Yiwei Zhang Committed by android-build-merger Apr 06, 2018

Move vkjson into framework/native/vulkan

am: f9a57e6a

Change-Id: Ib33c7e3aa56bf07d5c412bca960b85c5bd03da29

parents a8a5ab8c f9a57e6a

vulkan/Android.bp

+1 −0

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

vulkan/vkjson/.clang-format

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			BasedOnStyle: Chromium

vulkan/vkjson/Android.bp

0 → 100644

+52 −0

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