Don't use the STL in C projects.
The libc++ update doesn't play nicely with GCC compiling C sources.
(cherry picked from commit c9a5f94e1e4f41025fab1c5608851392d66df964)
Test: mm
Bug: None
Merged-In: I4d06c51f9d3396344d4617a6f0b8192f88ce7b87
Change-Id: I4d06c51f9d3396344d4617a6f0b8192f88ce7b87
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 62fe7ce..7c3f119 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) \
@@ -214,7 +216,7 @@
LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_SHARED_LIBRARIES:= \
- libcutils libdl libmmcamera_interface
+ libcutils libdl libmmcamera_interface liblog
LOCAL_MODULE_TAGS := optional
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk
index 90527f5..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_
@@ -58,7 +59,7 @@
LOCAL_MODULE := libmmjpeg_interface
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libqomx_core
+LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libqomx_core liblog
LOCAL_MODULE_TAGS := optional
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index 0df1a71..5406480 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -33,7 +33,7 @@
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
LOCAL_MODULE := mm-jpeg-interface-test
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog
include $(BUILD_EXECUTABLE)
@@ -72,7 +72,7 @@
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
LOCAL_MODULE := mm-jpegdec-interface-test
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog
include $(BUILD_EXECUTABLE)
