Update the Android makefile to include most C files.

The previous makefile included just couple of C files,
extend it to include most of the C source files.
We need the XZ container support in particular.

Change-Id: I31b8e5ffc67c10a0258902f9e787cd376a863d46
diff --git a/C/Android.mk b/C/Android.mk
new file mode 100644
index 0000000..539bbbc
--- /dev/null
+++ b/C/Android.mk
@@ -0,0 +1,57 @@
+# Copyright 2015 The Android Open Source Project
+#
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+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
+
+LOCAL_MODULE := liblzma
+LOCAL_CFLAGS := -D_7ZIP_ST
+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 := -D_7ZIP_ST
+LOCAL_SRC_FILES := $(lzma_files)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/C/Util/Lzma/Android.mk b/C/Util/Lzma/Android.mk
deleted file mode 100644
index e486b61..0000000
--- a/C/Util/Lzma/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2008 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := liblzma
-LOCAL_SRC_FILES := LzmaUtil.c ../../Alloc.c ../../LzFind.c ../../LzmaDec.c ../../LzmaEnc.c ../../7zFile.c ../../7zStream.c
-LOCAL_CFLAGS := -c -O2 -Wall -D_7ZIP_ST
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../
-include $(BUILD_HOST_STATIC_LIBRARY)