Snap for 4523885 from c43a0bbbb9e2ca87adf0c0baaea447ca14016bb6 to pi-release

Change-Id: I0259927d3abb5c1ac2ade6293e8777f132f82643

3 files changed, 108 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..d070a8f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,105 @@
+cc_defaults {
+    name: "puffin_defaults",
+    host_supported: true,
+    shared_libs: [
+        "libbrillo",
+        "libchrome",
+        "libprotobuf-cpp-lite",
+    ],
+    static_libs: [
+        "libbrotli",
+        "libbz",
+    ],
+    export_include_dirs: ["src/include"],
+    cflags: [
+        "-DUSE_BRILLO=1",
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+    ],
+}
+
+cc_library_static {
+    name: "libpuffpatch",
+    defaults: ["puffin_defaults"],
+    srcs: [
+        "puffin/src/puffin.proto",
+        "src/bit_reader.cc",
+        "src/bit_writer.cc",
+        "src/huffer.cc",
+        "src/huffman_table.cc",
+        "src/puff_reader.cc",
+        "src/puff_writer.cc",
+        "src/puffer.cc",
+        "src/puffin_stream.cc",
+        "src/puffpatch.cc",
+    ],
+    static_libs: [
+        "libbspatch",
+    ],
+    proto: {
+        type: "lite",
+        export_proto_headers: true,
+    },
+}
+
+cc_library_static {
+    name: "libpuffdiff",
+    defaults: ["puffin_defaults"],
+    srcs: [
+        "src/file_stream.cc",
+        "src/memory_stream.cc",
+        "src/puffdiff.cc",
+        "src/utils.cc",
+    ],
+    static_libs: [
+        "libbsdiff",
+        "libpuffpatch",
+    ],
+}
+
+cc_binary {
+    name: "puffin",
+    defaults: ["puffin_defaults"],
+    srcs: [
+        "src/extent_stream.cc",
+        "src/main.cc",
+    ],
+    static_libs: [
+        "libbsdiff",
+        "libbspatch",
+        "libdivsufsort",
+        "libdivsufsort64",
+        "libpuffdiff",
+        "libpuffpatch",
+    ],
+}
+
+cc_test {
+    name: "puffin_unittest",
+    defaults: ["puffin_defaults"],
+    test_suites: ["device-tests"],
+    cflags: ["-Wno-sign-compare"],
+    srcs: [
+        "src/bit_io_unittest.cc",
+        "src/extent_stream.cc",
+        "src/patching_unittest.cc",
+        "src/puff_io_unittest.cc",
+        "src/puffin_unittest.cc",
+        "src/sample_generator.cc",
+        "src/stream_unittest.cc",
+        "src/testrunner.cc",
+        "src/utils_unittest.cc",
+    ],
+    shared_libs: [
+        "libz",
+    ],
+    static_libs: [
+        "libbsdiff",
+        "libbspatch",
+        "libdivsufsort",
+        "libdivsufsort64",
+        "libpuffdiff",
+        "libpuffpatch",
+    ],
+}
diff --git a/OWNERS b/OWNERS
index 6f7625d..e27504b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
 set noparent
-ahassani@chromium.org
+ahassani@google.com
+senj@google.com
diff --git a/puffin b/puffin
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/puffin
@@ -0,0 +1 @@
+.
\ No newline at end of file