diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
index 30c4f7228..53d308778 100755
--- a/perftests/panorama/Android.mk
+++ b/perftests/panorama/Android.mk
@@ -9,8 +9,6 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/feature_stab/src \
     $(LOCAL_PATH)/feature_stab/db_vlvm
 
-LOCAL_CFLAGS := -O3 -DNDEBUG -Wno-unused-parameter -Wno-maybe-uninitialized
-
 LOCAL_SRC_FILES := benchmark.cpp \
 	feature_mos/src/mosaic/ImageUtils.cpp \
     feature_mos/src/mosaic/Mosaic.cpp \
@@ -38,22 +36,16 @@ LOCAL_SRC_FILES := benchmark.cpp \
     feature_stab/src/dbreg/dbreg.cpp \
     feature_stab/src/dbreg/vp_motionmodel.c
 
+LOCAL_CFLAGS := -O3 -DNDEBUG -Wno-unused-parameter -Wno-maybe-uninitialized
+LOCAL_CPPFLAGS := -std=c++98
 LOCAL_MODULE_TAGS := tests
-
 LOCAL_MODULE := panorama_bench
-
 LOCAL_MODULE_STEM_32 := panorama_bench
-
 LOCAL_MODULE_STEM_64 := panorama_bench64
-
 LOCAL_MULTILIB := both
-
 LOCAL_MODULE_PATH := $(local_target_dir)
-
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-
 LOCAL_STATIC_LIBRARIES := libc libm
 
 include $(BUILD_EXECUTABLE)