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

Commit 1163c372 authored Apr 06, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Apr 06, 2018

Merge changes from topic "vkjson-relocation" into pi-dev

* changes:
  Let vkjson use jsoncpp lib
  Move vkjson into framework/native/vulkan

parents c650f621 ef64b2a5

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: [
		"libjsoncpp",
		],
		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: [
		"libjsoncpp_ndk",
		],
		header_libs: [
		"vulkan_headers_ndk",
		],
		sdk_version: "24",
		stl: "libc++_static",
		}