summaryrefslogtreecommitdiff
path: root/crypto-perf
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-04 18:35:50 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-04 20:25:22 -0700
commit2a904afcb32568d3c33d56971c7b1783e265c8d5 (patch)
tree2ac40ff8a86c94ba1278ec98a7c59e19e579aafd /crypto-perf
parenta1b34a8173609094df0e124ecca19b619fc19a41 (diff)
downloadextras-2a904afcb32568d3c33d56971c7b1783e265c8d5.tar.gz
Convert to Soong
See build/soong/README.md for more information. This effectively moves some of these targets from /system/xbin to /system/bin, as Soong is not supporting xbin. I've attempted to fix and find any external dependencies to these paths. Test: m anrd app-launcher bootctrl.default bootctl cpustats crypto iotop Change-Id: I3eb58d8a260884652b5ee827ac88ece429d76448
Diffstat (limited to 'crypto-perf')
-rw-r--r--crypto-perf/Android.bp18
-rw-r--r--crypto-perf/Android.mk13
2 files changed, 18 insertions, 13 deletions
diff --git a/crypto-perf/Android.bp b/crypto-perf/Android.bp
new file mode 100644
index 00000000..60116891
--- /dev/null
+++ b/crypto-perf/Android.bp
@@ -0,0 +1,18 @@
+cc_binary {
+ name: "crypto",
+
+ cflags: [
+ "-O0",
+ "-march=armv8-a+crypto",
+ "-Wall",
+ "-Werror",
+ ],
+ srcs: ["crypto.cpp"],
+
+ enabled: false,
+ arch: {
+ arm64: {
+ enabled: true,
+ },
+ },
+}
diff --git a/crypto-perf/Android.mk b/crypto-perf/Android.mk
deleted file mode 100644
index 4a3cbe41..00000000
--- a/crypto-perf/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_ARCH),arm64)
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -O0 -march=armv8-a+crypto -Wall -Werror
-LOCAL_SRC_FILES := crypto.cpp
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := crypto
-
-include $(BUILD_EXECUTABLE)
-endif