summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-04 20:28:01 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-04 20:28:01 -0700
commit83336bf17a016ecc121f64e46798e488939ff7b3 (patch)
tree1e5d432226acb9a21f4786f0b3baf4aaeb2f8898
parentf105db5bd1934f0c3e5f74bbc9a5aaeac7a6bf2b (diff)
downloadmmc-utils-83336bf17a016ecc121f64e46798e488939ff7b3.tar.gz
Convert to Soong
See build/soong/README.md for more information. As a byproduct, this moves mmc_utils from /system/xbin to /system/bin, as Soong is not supporting installation into xbin. It also removes the debug tag, so it's no longer installed by default on all eng and userdebug builds. Test: mmma external/mmc-utils Change-Id: Id7190d3847ccb080122aa1beaa68e952747991b5
-rw-r--r--Android.bp14
-rw-r--r--Android.mk11
2 files changed, 14 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..6d0e8e7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,14 @@
+cc_binary {
+ name: "mmc_utils",
+ srcs: [
+ "mmc.c",
+ "mmc_cmds.c",
+
+ "3rdparty/hmac_sha/sha2.c",
+ "3rdparty/hmac_sha/hmac_sha2.c",
+ ],
+ cflags: ["-Werror"],
+ shared_libs: [
+ "libcutils",
+ ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index d66019b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_SRC_FILES:= mmc.c mmc_cmds.c
-LOCAL_SRC_FILES += 3rdparty/hmac_sha/sha2.c 3rdparty/hmac_sha/hmac_sha2.c
-LOCAL_CFLAGS += -Werror
-LOCAL_MODULE := mmc_utils
-LOCAL_SHARED_LIBRARIES := libcutils libc
-include $(BUILD_EXECUTABLE)