commit a51262b74c361900b540181810cd84da9a409a15
author David Lin <dtwlin@google.com> Thu Feb 23 15:21:38 2017 -0800
committer David Lin <dtwlin@google.com> Thu Feb 23 23:28:18 2017 +0000
tree 0745bfce033d3b047bb44f6b89c4cbbf186bbc70
parent 1e24ff9a421f63e5c37e308344b3fc987ae05af8
parent f68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5

Merge commit 'f68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5' to aosp/master

Change-Id: I8cfd6cd12923ca4ecb13195abb44f657eff11770
Signed-off-by: David Lin <dtwlin@google.com>

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..88f6530
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+// Copyright (C) 2015 The Android Open Source Project
+
+subdirs=["lib", "programs"]

LICENSE

diff --git a/lib/LICENSE b/LICENSE
similarity index 100%
rename from lib/LICENSE
rename to LICENSE

MODULE_LICENSE_BSD

diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD

NOTICE

diff --git a/lib/LICENSE b/NOTICE
similarity index 100%
copy from lib/LICENSE
copy to NOTICE

lib/Android.bp

diff --git a/lib/Android.bp b/lib/Android.bp
new file mode 100644
index 0000000..19d02a3
--- /dev/null
+++ b/lib/Android.bp
@@ -0,0 +1,13 @@
+// Copyright (C) 2015 The Android Open Source Project
+
+cc_library {
+    name: "liblz4",
+    host_supported: true,
+    srcs: [
+        "lz4.c",
+        "lz4hc.c",
+        "lz4frame.c",
+        "xxhash.c",
+    ],
+    export_include_dirs: ["."],
+}

programs/Android.bp

diff --git a/programs/Android.bp b/programs/Android.bp
new file mode 100644
index 0000000..0168035
--- /dev/null
+++ b/programs/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2016 The Android Open Source Project
+
+cc_binary_host {
+    name: "lz4",
+    srcs: [
+        "bench.c",
+        "lz4io.c",
+        "lz4cli.c",
+    ],
+    static_libs: ["liblz4"],
+    stl: "libc++_static",
+}
+
+cc_binary_host {
+    name: "lz4c",
+    cflags: ["-DENABLE_LZ4C_LEGACY_OPTIONS"],
+    srcs: [
+        "bench.c",
+        "lz4io.c",
+        "lz4cli.c",
+    ],
+    static_libs: ["liblz4"],
+    stl: "libc++_static",
+}