diff options
| author | Steven Moreland <smoreland@google.com> | 2017-05-17 02:40:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-17 02:40:08 +0000 |
| commit | 551fa7a6f271a81dba459cd07d21c567170cdb9b (patch) | |
| tree | c75d750ed7e7887876bebfe8b0d14dfe3a1d3fc6 | |
| parent | 68be237ad3f4d144896147e2b4cb84a123a32092 (diff) | |
| parent | 95e0e4c650a90d86dcc99ac1e06ed5e983c00918 (diff) | |
| download | lzma-oreo-dr1-dev.tar.gz | |
Merge "libxz: Android.mk -> Android.bp" am: 078994b97d am: 257279629b am: 0f97354095oreo-dr1-dev
am: 95e0e4c650
Change-Id: I54c8968efd494bf90f53caa5381c560dce9237a1
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | xz-embedded/Android.bp | 14 | ||||
| -rw-r--r-- | xz-embedded/Android.mk | 21 |
3 files changed, 18 insertions, 22 deletions
@@ -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) |