commit 078994b97d898d377ccccf83eb784350d7fe73f3
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 17 02:26:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 17 02:26:58 2017 +0000
tree c75d750ed7e7887876bebfe8b0d14dfe3a1d3fc6
parent 46b54e959fbe772aa87e40e3805e4f118e7f1258
parent e3ee00a6fda0bc22a0c6bd1eb0726f8294e10979

Merge "libxz: Android.mk -> Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
index e0454ba..6753f7b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1 +1,4 @@
-subdirs = ["C"]
+subdirs = [
+    "C",
+    "xz-embedded",
+]

xz-embedded/Android.bp

diff --git a/xz-embedded/Android.bp b/xz-embedded/Android.bp
new file mode 100644
index 0000000..e1e4d16
--- /dev/null
+++ b/xz-embedded/Android.bp
@@ -0,0 +1,14 @@
+// Copyright 2013 The Android Open Source Project
+//
+
+cc_library_static {
+    name: "libxz",
+    host_supported: true,
+    srcs: [
+        "xz_crc32.c",
+        "xz_dec_bcj.c",
+        "xz_dec_lzma2.c",
+        "xz_dec_stream.c",
+    ],
+    export_include_dirs: ["."],
+}

xz-embedded/Android.mk

diff --git a/xz-embedded/Android.mk b/xz-embedded/Android.mk
deleted file mode 100644
index 20dd88f..0000000
--- a/xz-embedded/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2013 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-
-xz_embedded_sources := \
-    xz_crc32.c \
-    xz_dec_bcj.c \
-    xz_dec_lzma2.c \
-    xz_dec_stream.c
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libxz
-LOCAL_SRC_FILES := $(xz_embedded_sources)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libxz-host
-LOCAL_SRC_FILES := $(xz_embedded_sources)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_HOST_STATIC_LIBRARY)