LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f38993ca: am 409b471e: Merge "Explicitly use an older C++ standard."

Browse Source 
* commit 'f38993ca440daeac1183269fa12d4773a2ae471b':
  Explicitly use an older C++ standard.
This commit is contained in:
Dan Albert
2014-11-20 21:13:17 +00:00
committed by Android Git Automerger
parent 6cce3ffc09 f38993ca44
commit 20524e41a4
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
perftests/panorama/Android.mk
View File

@@ -9,8 +9,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/feature_stab/src \ $(LOCAL_PATH)/feature_stab/src \
$(LOCAL_PATH)/feature_stab/db_vlvm $(LOCAL_PATH)/feature_stab/db_vlvm
LOCAL_CFLAGS := -O3 -DNDEBUG -Wno-unused-parameter -Wno-maybe-uninitialized
LOCAL_SRC_FILES := benchmark.cpp \ LOCAL_SRC_FILES := benchmark.cpp \
feature_mos/src/mosaic/ImageUtils.cpp \ feature_mos/src/mosaic/ImageUtils.cpp \
feature_mos/src/mosaic/Mosaic.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/dbreg.cpp \
feature_stab/src/dbreg/vp_motionmodel.c 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_TAGS := tests
LOCAL_MODULE := panorama_bench LOCAL_MODULE := panorama_bench
LOCAL_MODULE_STEM_32 := panorama_bench LOCAL_MODULE_STEM_32 := panorama_bench
LOCAL_MODULE_STEM_64 := panorama_bench64 LOCAL_MODULE_STEM_64 := panorama_bench64
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_MODULE_PATH := $(local_target_dir) LOCAL_MODULE_PATH := $(local_target_dir)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_STATIC_LIBRARIES := libc libm LOCAL_STATIC_LIBRARIES := libc libm
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)