Snap for 4706961 from 42393395be4cf94d0a0030fb22f9ec38fabf842e to pi-release
Change-Id: I072b40f64bc73286eec7c3d0d5907ad81a653b20
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index e95bc5d..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,4 +0,0 @@
-subdirs = [
- "libs/cjson",
- "libs/vkjson",
-]
diff --git a/libs/cjson/Android.bp b/libs/cjson/Android.bp
deleted file mode 100644
index 6a1600c..0000000
--- a/libs/cjson/Android.bp
+++ /dev/null
@@ -1,36 +0,0 @@
-cc_library_static {
- name: "cjson",
- clang: true,
- srcs: [
- "cJSON.c",
- ],
- cflags: [
- "-Wall",
- "-Werror",
- ],
- local_include_dirs: [
- "includes",
- ],
- export_include_dirs: [
- "includes",
- ],
-}
-
-cc_library_static {
- name: "cjson_ndk",
- clang: true,
- srcs: [
- "cJSON.c",
- ],
- cflags: [
- "-Wall",
- "-Werror",
- ],
- local_include_dirs: [
- "includes",
- ],
- export_include_dirs: [
- "includes",
- ],
- sdk_version: "24",
-}
diff --git a/libs/vkjson/Android.bp b/libs/vkjson/Android.bp
deleted file mode 100644
index 1b32e7a..0000000
--- 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",
-}
