summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.bp5
-rw-r--r--xz-embedded/Android.bp14
-rw-r--r--xz-embedded/Android.mk21
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)