diff options
| author | Colin Cross <ccross@android.com> | 2016-05-27 12:55:59 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-05-27 15:19:55 -0700 |
| commit | 6c558ce620794b780b3f1a31cbc3af0d7478345c (patch) | |
| tree | a0dfb8e936aaf82e224014b5861c56d568f09d7d | |
| parent | bbd5b471a18af2a281a620cb1edd0274d1c5fac5 (diff) | |
| download | lzma-6c558ce620794b780b3f1a31cbc3af0d7478345c.tar.gz | |
Remove deprecated Android.mk files
These directories all have Android.bp files that are always used now,
delete the Android.mk files.
Change-Id: I91ed259cf9e1de1a4ff3c17dd0fc4b32bcee63f1
| -rw-r--r-- | Android.soong.mk | 4 | ||||
| -rw-r--r-- | C/Android.mk | 81 |
2 files changed, 4 insertions, 81 deletions
diff --git a/Android.soong.mk b/Android.soong.mk new file mode 100644 index 0000000..93dd9d4 --- /dev/null +++ b/Android.soong.mk @@ -0,0 +1,4 @@ +LOCAL_PATH := $(call my-dir) + +include $(call first-makefiles-under,$(LOCAL_PATH)) + diff --git a/C/Android.mk b/C/Android.mk deleted file mode 100644 index cc551af..0000000 --- a/C/Android.mk +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -LOCAL_PATH := $(call my-dir) - -lzma_files := \ - 7zAlloc.c \ - 7zArcIn.c \ - 7zBuf2.c \ - 7zBuf.c \ - 7zCrc.c \ - 7zCrcOpt.c \ - 7zDec.c \ - 7zFile.c \ - 7zStream.c \ - Aes.c \ - AesOpt.c \ - Alloc.c \ - Bcj2.c \ - Bra86.c \ - Bra.c \ - BraIA64.c \ - CpuArch.c \ - Delta.c \ - LzFind.c \ - Lzma2Dec.c \ - Lzma2Enc.c \ - Lzma86Dec.c \ - Lzma86Enc.c \ - LzmaDec.c \ - LzmaEnc.c \ - LzmaLib.c \ - Ppmd7.c \ - Ppmd7Dec.c \ - Ppmd7Enc.c \ - Sha256.c \ - Sort.c \ - Xz.c \ - XzCrc64.c \ - XzCrc64Opt.c \ - XzDec.c \ - XzEnc.c \ - XzIn.c - -lzma_cflags := -D_7ZIP_ST -Wno-empty-body -Wno-sign-compare -lzma_clang_cflags := -Wno-self-assign - -include $(CLEAR_VARS) -LOCAL_MODULE := liblzma -LOCAL_MODULE_HOST_OS := linux darwin windows -LOCAL_CFLAGS := $(lzma_cflags) -LOCAL_CLANG_CFLAGS := $(lzma_clang_cflags) -LOCAL_SRC_FILES := $(lzma_files) -LOCAL_MULTILIB := both -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HOST_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := liblzma -LOCAL_CFLAGS := $(lzma_cflags) -LOCAL_CLANG_CFLAGS := $(lzma_clang_cflags) -LOCAL_SRC_FILES := $(lzma_files) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := liblzma -LOCAL_MODULE_HOST_OS := linux darwin windows -LOCAL_CFLAGS := $(lzma_cflags) -LOCAL_CLANG_CFLAGS := $(lzma_clang_cflags) -LOCAL_SRC_FILES := $(lzma_files) -LOCAL_MULTILIB := both -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HOST_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := liblzma -LOCAL_CFLAGS := $(lzma_cflags) -LOCAL_CLANG_CFLAGS := $(lzma_clang_cflags) -LOCAL_SRC_FILES := $(lzma_files) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_SHARED_LIBRARY) |