diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-20 13:05:04 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 13:05:04 -0800 |
| commit | 3a6d1cb4a49e0f1a697007fcf2d76338454bc6cb (patch) | |
| tree | c2f6b2a41b7662abb5e907a82f18cbacc704ad08 | |
| parent | a01b84ff0b99a1f00d2548903a682ec8ddd470c7 (diff) | |
| parent | d59d9c46ee33d009f4ebc3ff94b5f82b10191fdb (diff) | |
| download | stressapptest-3a6d1cb4a49e0f1a697007fcf2d76338454bc6cb.tar.gz | |
Merge "Convert stressapptest to Android.bp" am: 43255662e6
am: d59d9c46ee
Change-Id: I91aff25571759b65f681b187c506d6d71bf75d96
| -rw-r--r-- | Android.bp | 45 | ||||
| -rw-r--r-- | Android.mk | 31 |
2 files changed, 45 insertions, 31 deletions
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) |