aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp108
-rw-r--r--C/Android.bp114
2 files changed, 104 insertions, 118 deletions
diff --git a/Android.bp b/Android.bp
index b1ffe6c..752a8f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,9 @@
+// Copyright 2015 The Android Open Source Project
+
package {
default_applicable_licenses: ["external_lzma_license"],
}
-// Added automatically by a large-scale-change
license {
name: "external_lzma_license",
visibility: [":__subpackages__"],
@@ -14,6 +15,105 @@ license {
],
}
-subdirs = [
- "C",
-]
+cc_library {
+ name: "liblzma",
+ host_supported: true,
+ vendor_available: true,
+ product_available: true,
+ ramdisk_available: true,
+ recovery_available: true,
+ vendor_ramdisk_available: true,
+ native_bridge_supported: true,
+ double_loadable: true,
+ sdk_version: "9",
+ stl: "none",
+
+ cflags: [
+ "-DZ7_ST",
+ "-Wall",
+ "-Werror",
+ "-Wno-empty-body",
+ "-Wno-enum-conversion",
+ "-Wno-logical-op-parentheses",
+ "-Wno-self-assign",
+ ],
+
+ export_include_dirs: ["C"],
+
+ srcs: [
+ "C/7zAlloc.c",
+ "C/7zArcIn.c",
+ "C/7zBuf2.c",
+ "C/7zBuf.c",
+ "C/7zCrc.c",
+ "C/7zCrcOpt.c",
+ "C/7zDec.c",
+ "C/7zFile.c",
+ "C/7zStream.c",
+ "C/Aes.c",
+ "C/AesOpt.c",
+ "C/Alloc.c",
+ "C/Bcj2.c",
+ "C/Bra86.c",
+ "C/Bra.c",
+ "C/BraIA64.c",
+ "C/CpuArch.c",
+ "C/Delta.c",
+ "C/LzFind.c",
+ "C/Lzma2Dec.c",
+ "C/Lzma2Enc.c",
+ "C/Lzma86Dec.c",
+ "C/Lzma86Enc.c",
+ "C/LzmaDec.c",
+ "C/LzmaEnc.c",
+ "C/LzmaLib.c",
+ "C/Ppmd7.c",
+ "C/Ppmd7Dec.c",
+ "C/Ppmd7Enc.c",
+ "C/Sha256.c",
+ "C/Sha256Opt.c",
+ "C/Sort.c",
+ "C/Xz.c",
+ "C/XzCrc64.c",
+ "C/XzCrc64Opt.c",
+ "C/XzDec.c",
+ "C/XzEnc.c",
+ "C/XzIn.c",
+ ],
+
+ arch: {
+ arm: {
+ cflags: ["-march=armv8-a+crypto"],
+ },
+ arm64: {
+ cflags: ["-march=armv8-a+crypto"],
+ },
+ },
+
+ target: {
+ linux_bionic: {
+ enabled: true,
+ },
+ windows: {
+ enabled: true,
+ srcs: [
+ "C/Bcj2Enc.c",
+ "C/DllSecur.c",
+ "C/LzFindMt.c",
+ "C/LzFindOpt.c",
+ "C/Lzma2DecMt.c",
+ "C/MtCoder.c",
+ "C/MtDec.c",
+ "C/Threads.c",
+ ],
+ },
+ },
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.art", // from libartbase
+ "com.android.art.debug",
+ "com.android.runtime",
+ ],
+ min_sdk_version: "apex_inherit",
+}
diff --git a/C/Android.bp b/C/Android.bp
deleted file mode 100644
index 071f557..0000000
--- a/C/Android.bp
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015 The Android Open Source Project
-
-package {
- // A large-scale-change added 'default_applicable_licenses' to import
- // the below license kinds from "external_lzma_license":
- // legacy_unencumbered
- default_applicable_licenses: ["external_lzma_license"],
-}
-
-cc_library {
- name: "liblzma",
- host_supported: true,
- vendor_available: true,
- product_available: true,
- ramdisk_available: true,
- recovery_available: true,
- vendor_ramdisk_available: true,
- native_bridge_supported: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
- sdk_version: "9",
- stl: "none",
-
- cflags: [
- "-DZ7_ST",
- "-Wall",
- "-Werror",
- "-Wno-empty-body",
- "-Wno-enum-conversion",
- "-Wno-logical-op-parentheses",
- "-Wno-self-assign",
- ],
-
- export_include_dirs: ["."],
-
- srcs: [
- "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",
- "Sha256Opt.c",
- "Sort.c",
- "Xz.c",
- "XzCrc64.c",
- "XzCrc64Opt.c",
- "XzDec.c",
- "XzEnc.c",
- "XzIn.c",
- ],
-
- arch: {
- arm: {
- cflags: ["-march=armv8-a+crypto"],
- },
- arm64: {
- cflags: ["-march=armv8-a+crypto"],
- },
- },
-
- target: {
- linux_bionic: {
- enabled: true,
- },
- windows: {
- enabled: true,
- srcs: [
- "Bcj2Enc.c",
- "DllSecur.c",
- "LzFindMt.c",
- "LzFindOpt.c",
- "Lzma2DecMt.c",
- "MtCoder.c",
- "MtDec.c",
- "Threads.c",
- ],
- },
- },
-
- apex_available: [
- "//apex_available:platform",
- "com.android.art", // from libartbase
- "com.android.art.debug",
- "com.android.runtime",
- ],
- min_sdk_version: "apex_inherit",
-}