summaryrefslogtreecommitdiff
path: root/verity
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 /verity
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 'verity')
-rw-r--r--verity/Android.bp20
-rw-r--r--verity/Android.mk27
2 files changed, 20 insertions, 27 deletions
diff --git a/verity/Android.bp b/verity/Android.bp
index f0460db2..550b800b 100644
--- a/verity/Android.bp
+++ b/verity/Android.bp
@@ -130,3 +130,23 @@ cc_test {
"libverity_tree",
],
}
+
+// VeritySigner should probably just be a java_binary
+sh_binary_host {
+ name: "verity_signer",
+ src: "verity_signer",
+ required: ["VeritySigner"],
+}
+
+// BootSignature should probably just be a java_binary
+sh_binary_host {
+ name: "boot_signer",
+ src: "boot_signer",
+ required: ["BootSignature"],
+}
+
+// This should probably be a python_binary_host
+sh_binary_host {
+ name: "build_verity_metadata.py",
+ src: "build_verity_metadata.py",
+}
diff --git a/verity/Android.mk b/verity/Android.mk
deleted file mode 100644
index 4cf136a0..00000000
--- a/verity/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := verity_signer
-LOCAL_MODULE := verity_signer
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := VeritySigner
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := boot_signer
-LOCAL_MODULE := boot_signer
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := BootSignature
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := build_verity_metadata.py
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_SRC_FILES := build_verity_metadata.py
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)