summaryrefslogtreecommitdiff
path: root/squashfs_utils
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-03-23 13:53:03 -0700
committerDan Willemsen <dwillemsen@google.com>2019-03-28 16:00:55 +0000
commitebab93799755fcd737229fdcfc5675342d8d7400 (patch)
tree96070549cf5a668aaf47835f5269f7705668bf42 /squashfs_utils
parenta3cec0985a0df8a01a2a1ca143ba6aa035536d2c (diff)
downloadextras-ebab93799755fcd737229fdcfc5675342d8d7400.tar.gz
Convert more of system/extras to Android.bp
See build/soong/README.md for more information about Soong. Bug: 122331914 Test: cd system/extras; mma Test: treehugger Change-Id: Ic1cf293df2c848c7476ca93c150106a4a3cd849c
Diffstat (limited to 'squashfs_utils')
-rw-r--r--squashfs_utils/Android.bp11
-rw-r--r--squashfs_utils/Android.mk14
2 files changed, 10 insertions, 15 deletions
diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp
index d09dad6e..350ed888 100644
--- a/squashfs_utils/Android.bp
+++ b/squashfs_utils/Android.bp
@@ -17,8 +17,17 @@ cc_library {
target: {
host: {
- cflags: ["-Wall", "-Werror", "-D_GNU_SOURCE", "-DSQUASHFS_NO_KLOG"]
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-D_GNU_SOURCE",
+ "-DSQUASHFS_NO_KLOG",
+ ],
},
},
+}
+sh_binary_host {
+ name: "mksquashfsimage.sh",
+ src: "mksquashfsimage.sh",
}
diff --git a/squashfs_utils/Android.mk b/squashfs_utils/Android.mk
deleted file mode 100644
index bf60cf4c..00000000
--- a/squashfs_utils/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mksquashfsimage.sh
-LOCAL_SRC_FILES := mksquashfsimage.sh
-LOCAL_MODULE_CLASS := EXECUTABLES
-# We don't need any additional suffix.
-LOCAL_MODULE_SUFFIX :=
-LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_HOST_OS := linux darwin
-include $(BUILD_PREBUILT)