Merge brotli tag 'v1.0.1' into master.
The latest stable version of brotli is v1.0.1, which is also the "1.0"
version.
This CL updates the Android.bp to match the source location changes
(all C code is now under c/). It also renames the binary to "brotli" to
match upstream binary name.
Bug: 34220646
Test: mmma external/brotli -j5; run "brotli" command manually.
Change-Id: Ice1c49c20b62a09e6e4f64ca7b2e3c0a29cde570
diff --git a/Android.bp b/Android.bp
index 85cb1b3..531a784 100755
--- a/Android.bp
+++ b/Android.bp
@@ -5,12 +5,11 @@
"-Werror",
"-O2",
],
- export_include_dirs: ["include/"],
- local_include_dirs: ["include/"],
+ export_include_dirs: ["c/include"],
srcs: [
- "common/*.c",
- "dec/*.c",
- "enc/*.c",
+ "c/common/*.c",
+ "c/dec/*.c",
+ "c/enc/*.c",
],
target: {
linux_bionic: {
@@ -21,10 +20,10 @@
}
cc_binary {
- name: "bro",
+ name: "brotli",
host_supported: true,
cflags: ["-Werror"],
- srcs: ["tools/bro.c"],
+ srcs: ["c/tools/brotli.c"],
target: {
linux_bionic: {
enabled: true,