Merge "Build Breakage in branch: git_master @ 2265859"

Author: Mark Salyzyn

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)

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;
+}