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
new file mode 100755
index 0000000..531a784
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,33 @@
+cc_library {
+ name: "libbrotli",
+ host_supported: true,
+ cflags: [
+ "-Werror",
+ "-O2",
+ ],
+ export_include_dirs: ["c/include"],
+ srcs: [
+ "c/common/*.c",
+ "c/dec/*.c",
+ "c/enc/*.c",
+ ],
+ target: {
+ linux_bionic: {
+ enabled: true,
+ },
+ },
+ stl: "none",
+}
+
+cc_binary {
+ name: "brotli",
+ host_supported: true,
+ cflags: ["-Werror"],
+ srcs: ["c/tools/brotli.c"],
+ target: {
+ linux_bionic: {
+ enabled: true,
+ },
+ },
+ shared_libs: ["libbrotli"],
+}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..b3b4d2a
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,40 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Support for brotli in java code.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+brotli_src_files := $(filter-out %Test.java,$(call all-java-files-under, java/))
+
+# Target build
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(brotli_src_files)
+LOCAL_MODULE := brotli-java
+include $(BUILD_JAVA_LIBRARY)
+
+# Host-side Java build
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(brotli_src_files)
+LOCAL_MODULE := brotli-java
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+# Host-side Dalvik build
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(brotli_src_files)
+LOCAL_MODULE := brotli-java-hostdex
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..07ed559
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,52 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/bro)
+$(call add-clean-step, rm -rf $(HOST_OUT)/bin/bro)
diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_MIT
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..c99eb32
--- /dev/null
+++ b/README.version
@@ -0,0 +1,4 @@
+URL: https://github.com/google/brotli.git
+Version: 5b4769990dc14a2bd466d2599c946c5652cba4b2
+BugComponent: 119451
+Owners: enh, android-janitors
