From 67991441ce45182d890dbb6841a5d26af9c7090e Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 19 Nov 2018 16:04:14 -0800 Subject: Convert stressapptest to Android.bp See build/soong/README.md for more information. Test: cd external/stressapptest; mma Change-Id: If3eba20f5f14df0ca43bff53f3dc9e6313cf03b1 --- Android.bp | 45 +++++++++++++++++++++++++++++++++++++++++++++ Android.mk | 31 ------------------------------- 2 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..03bfd79 --- /dev/null +++ b/Android.bp @@ -0,0 +1,45 @@ +cc_binary { + name: "stressapptest", + + srcs: [ + "src/main.cc", + "src/adler32memcpy.cc", + "src/disk_blocks.cc", + "src/error_diag.cc", + "src/finelock_queue.cc", + "src/logger.cc", + "src/os.cc", + "src/os_factory.cc", + "src/pattern.cc", + "src/queue.cc", + "src/sat.cc", + "src/sat_factory.cc", + "src/worker.cc", + ], + + arch: { + mips: { + enabled: false, + }, + x86: { + enabled: false, + }, + x86_64: { + enabled: false, + }, + }, + + cflags: [ + "-DHAVE_CONFIG_H", + "-DANDROID", + "-DNDEBUG", + "-UDEBUG", + "-DCHECKOPTS", + + "-Wall", + "-Werror", + "-Wno-unused-parameter", + "-Wno-#warnings", + "-Wno-implicit-fallthrough", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 0a6b323..0000000 --- a/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_SRC_FILES := \ - src/main.cc \ - src/adler32memcpy.cc \ - src/disk_blocks.cc \ - src/error_diag.cc \ - src/finelock_queue.cc \ - src/logger.cc \ - src/os.cc \ - src/os_factory.cc \ - src/pattern.cc \ - src/queue.cc \ - src/sat.cc \ - src/sat_factory.cc \ - src/worker.cc - -LOCAL_MODULE := stressapptest -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips x86 x86_64 - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS -LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-\#warnings -LOCAL_CFLAGS += -Wno-implicit-fallthrough - -LOCAL_CPP_EXTENSION := .cc - -include $(BUILD_EXECUTABLE) -- cgit v1.2.3