release-request-3605d486-97ee-488a-9bef-b52de93b00b5-for-git_oc-dr1-release-4017239 snap-temp-L53000000064886993android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: Id7b9b25729afb54c589ae8bb9c36ecc1111ac95f

3 files changed, 18 insertions, 22 deletions

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",
+]
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: ["."],
+}
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)