Merge "Updated Android.bp to build fuzzer targets"
am: 02392be07c

Change-Id: Ieb9aa493bfa7e6d4354c5491451b7307ab1cf3d5
diff --git a/Android.bp b/Android.bp
index 70e113c..1f0761c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1163,3 +1163,76 @@
         blacklist: "libvpx_blacklist.txt",
     },
 }
+
+cc_fuzz {
+    name: "vp9_dec_fuzzer",
+    host_supported: true,
+    srcs: [
+        "libvpx/examples/vpx_dec_fuzzer.cc",
+    ],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+    arch: {
+        arm: {
+            neon: {
+                local_include_dirs: ["config/arm-neon"],
+            },
+        },
+
+        arm64: {
+            local_include_dirs: ["config/arm64"],
+        },
+
+        x86: {
+            local_include_dirs: ["config/x86"],
+        },
+
+        x86_64: {
+            local_include_dirs: ["config/x86_64"],
+        },
+    },
+    cflags: ["-DDECODER=vp9"],
+    static_libs: [
+        "libvpx",
+    ],
+}
+
+cc_fuzz {
+    name: "vp8_dec_fuzzer",
+    host_supported: true,
+    srcs: [
+        "libvpx/examples/vpx_dec_fuzzer.cc",
+    ],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+    arch: {
+        arm: {
+            neon: {
+                local_include_dirs: ["config/arm-neon"],
+            },
+        },
+
+        arm64: {
+            local_include_dirs: ["config/arm64"],
+        },
+
+        x86: {
+            local_include_dirs: ["config/x86"],
+        },
+
+        x86_64: {
+            local_include_dirs: ["config/x86_64"],
+        },
+    },
+
+    cflags: ["-DDECODER=vp8"],
+    static_libs: [
+        "libvpx",
+    ],
+}
diff --git a/Android.bp.in b/Android.bp.in
index 91a0ec6..612551c 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -59,3 +59,76 @@
         blacklist: "libvpx_blacklist.txt",
     },
 }
+
+cc_fuzz {
+    name: "vp9_dec_fuzzer",
+    host_supported: true,
+    srcs: [
+        "libvpx/examples/vpx_dec_fuzzer.cc",
+    ],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+    arch: {
+        arm: {
+            neon: {
+                local_include_dirs: ["config/arm-neon"],
+            },
+        },
+
+        arm64: {
+            local_include_dirs: ["config/arm64"],
+        },
+
+        x86: {
+            local_include_dirs: ["config/x86"],
+        },
+
+        x86_64: {
+            local_include_dirs: ["config/x86_64"],
+        },
+    },
+    cflags: ["-DDECODER=vp9"],
+    static_libs: [
+        "libvpx",
+    ],
+}
+
+cc_fuzz {
+    name: "vp8_dec_fuzzer",
+    host_supported: true,
+    srcs: [
+        "libvpx/examples/vpx_dec_fuzzer.cc",
+    ],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+    arch: {
+        arm: {
+            neon: {
+                local_include_dirs: ["config/arm-neon"],
+            },
+        },
+
+        arm64: {
+            local_include_dirs: ["config/arm64"],
+        },
+
+        x86: {
+            local_include_dirs: ["config/x86"],
+        },
+
+        x86_64: {
+            local_include_dirs: ["config/x86_64"],
+        },
+    },
+
+    cflags: ["-DDECODER=vp8"],
+    static_libs: [
+        "libvpx",
+    ],
+}