diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-12 13:49:54 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-01-18 09:19:10 -0800 |
| commit | f986c1804711e2d9482bf56a4544888715384bf3 (patch) | |
| tree | f560e26c4fc7c79867f8c18f73eb17a7ce3086b4 | |
| parent | f82d177d9e5435338ad2efc4e79051e159f4f638 (diff) | |
| download | bullhead-f986c1804711e2d9482bf56a4544888715384bf3.tar.gz | |
Don't use the STL in C projects.android-wear-8.0.0_r1
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
4 files changed, 8 insertions, 4 deletions
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 @@ include $(CLEAR_VARS) # 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 @@ include $(CLEAR_VARS) # 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 @@ include $(CLEAR_VARS) # 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 @@ endif 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 @@ include $(CLEAR_VARS) # 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_SRC_FILES := \ 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_SRC_FILES := mm_jpeg_test.c 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_SRC_FILES := mm_jpegdec_test.c 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) |