Merge "Don't use the STL in C projects."
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index cef137d..8558581 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -6,6 +6,7 @@
# Too many clang warnings/errors, see b/23163853.
LOCAL_CLANG := false
+LOCAL_CXX_STL := none
MM_CAM_FILES := \
src/mm_camera_interface.c \
diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk
index 74c7b3b..a9bf3cb 100644
--- a/camera/QCamera2/stack/mm-camera-test/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-test/Android.mk
@@ -7,6 +7,7 @@
# b/24171136 many files not compiling with clang/llvm yet
LOCAL_CLANG := false
+LOCAL_CXX_STL := none
LOCAL_CFLAGS:= \
-DAMSS_VERSION=$(AMSS_VERSION) \
@@ -118,6 +119,7 @@
# b/24171136 many files not compiling with clang/llvm yet
LOCAL_CLANG := false
+LOCAL_CXX_STL := none
LOCAL_CFLAGS:= \
-DAMSS_VERSION=$(AMSS_VERSION) \
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk
index cc270e2..344e74b 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk
@@ -6,6 +6,7 @@
# Too many clang warnings/errors, see b/23163853.
LOCAL_CLANG := false
+LOCAL_CXX_STL := none
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
LOCAL_CFLAGS+= -D_ANDROID_
