aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2017-11-18 02:13:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-18 02:13:17 +0000
commit8ca9784df90d7b28a94ec7459cbdf8f7ad59a17e (patch)
tree9b19586ba763a97e7a7904097d20640b54be82ff
parent51d32c707760dfb47b380f0e32d89969dd47e621 (diff)
parentf385333169ff8d211145eedae46c7faf1dd10916 (diff)
downloadsquashfs-tools-8ca9784df90d7b28a94ec7459cbdf8f7ad59a17e.tar.gz
Migrate to blueprint
am: f385333169 Change-Id: I902ed30791e0158ee97a2d83bf844b98ec7e3305
-rw-r--r--Android.mk5
-rw-r--r--squashfs-tools/Android.bp71
-rw-r--r--squashfs-tools/Android.mk43
3 files changed, 71 insertions, 48 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index d81662e..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2015 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/squashfs-tools/Android.bp b/squashfs-tools/Android.bp
new file mode 100644
index 0000000..b543228
--- /dev/null
+++ b/squashfs-tools/Android.bp
@@ -0,0 +1,71 @@
+// Copyright 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_defaults {
+ name: "squashfs-tools_defaults",
+
+ cflags: [
+ "-D_FILE_OFFSET_BITS=64",
+ "-D_LARGEFILE_SOURCE",
+ "-D_GNU_SOURCE",
+ "-Wall",
+ "-DCOMP_DEFAULT=\"lz4\"",
+ "-DGZIP_SUPPORT",
+ "-DLZ4_SUPPORT",
+ "-DXATTR_SUPPORT",
+ "-DXATTR_DEFAULT",
+ "-Wno-unused-parameter",
+ "-Wno-sign-compare",
+ "-Wno-pointer-arith",
+ "-Wno-missing-field-initializers",
+ "-Wno-unused-function",
+ "-Werror",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "libselinux",
+ ],
+ static_libs: [
+ "liblz4",
+ "libz",
+ ],
+}
+
+cc_binary_host {
+ name: "mksquashfs",
+
+ defaults: ["squashfs-tools_defaults"],
+
+ srcs: [
+ "mksquashfs.c",
+ "read_fs.c",
+ "action.c",
+ "swap.c",
+ "pseudo.c",
+ "compressor.c",
+ "sort.c",
+ "progressbar.c",
+ "read_file.c",
+ "info.c",
+ "restore.c",
+ "process_fragments.c",
+ "caches-queues-lists.c",
+ "xattr.c",
+ "read_xattrs.c",
+ "gzip_wrapper.c",
+ "android.c",
+ "lz4_wrapper.c",
+ ],
+}
diff --git a/squashfs-tools/Android.mk b/squashfs-tools/Android.mk
deleted file mode 100644
index 10b45b6..0000000
--- a/squashfs-tools/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2015 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# squashfs-tools depends on Linux Kernel specific headers (e.g. sysinfo.h).
-LOCAL_MODULE_HOST_OS := linux darwin
-
-# The LOCAL_MODULE name is referenced by the code. Don't change it.
-LOCAL_MODULE := mksquashfs
-
-LOCAL_SRC_FILES := \
- mksquashfs.c \
- read_fs.c \
- action.c \
- swap.c \
- pseudo.c \
- compressor.c \
- sort.c \
- progressbar.c \
- read_file.c \
- info.c \
- restore.c \
- process_fragments.c \
- caches-queues-lists.c \
- xattr.c \
- read_xattrs.c \
- gzip_wrapper.c \
- android.c \
- lz4_wrapper.c
-
-LOCAL_CFLAGS := -I -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -Wall \
- -DCOMP_DEFAULT="\"lz4\"" -DGZIP_SUPPORT -DLZ4_SUPPORT -DXATTR_SUPPORT -DXATTR_DEFAULT \
- -Wno-unused-parameter -Wno-sign-compare -Wno-pointer-arith -Wno-missing-field-initializers \
- -Wno-unused-function -Werror
-
-LOCAL_LDLIBS := -lm
-
-LOCAL_SHARED_LIBRARIES := libcutils libselinux
-LOCAL_STATIC_LIBRARIES := liblz4 libz
-
-include $(BUILD_HOST_EXECUTABLE)