Snap for 4706961 from 42393395be4cf94d0a0030fb22f9ec38fabf842e to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: I072b40f64bc73286eec7c3d0d5907ad81a653b20

3 files changed, 0 insertions, 92 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index e95bc5d51..000000000
--- 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 6a1600cd8..000000000
--- 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 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",
-}