Build Breakage in branch: git_master @ 2265859

Split mmap-perf into a 32 and 64-bit version.

(cherry picked from commit 03def1b807fd15bd057a437bd451fb659403907f)

Change-Id: I0b69fa9b88ee571186a2c69c56b7ef46c145370a

diff --git a/mmap-perf/Android.mk b/mmap-perf/Android.mk
index f9a4a96..3c6f489 100644 (file)
--- a/mmap-perf/Android.mk
+++ b/mmap-perf/Android.mk
@@ -18,10 +18,12 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := mmapPerf
-LOCAL_SRC_FILES := mmapPerf.cpp
+LOCAL_SRC_FILES_64 := mmapPerf.cpp
+LOCAL_SRC_FILES_32 := unsupported.cpp
 LOCAL_CLANG := true
 LOCAL_CFLAGS += -g -Wall -Werror -std=c++11 -Wno-missing-field-initializers -Wno-sign-compare -O3
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_CXX_STL := libc++_static
 LOCAL_STATIC_LIBRARIES := libc
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_EXECUTABLE)

diff --git a/mmap-perf/unsupported.cpp b/mmap-perf/unsupported.cpp
new file mode 100644 (file)
index 0000000..77d633e
--- /dev/null
+++ b/mmap-perf/unsupported.cpp
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    fprintf(stderr, "mmap-perf is unsupported for 32-bit architectures\n");
+    return -1;
+}