diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-18 07:15:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-18 07:15:51 +0000 |
| commit | e24f2ae4f46494d5e12b7d4243a7500db067882b (patch) | |
| tree | 160e2c4cba440d8f0d0db84c6363ced164de7314 | |
| parent | 5cedca462b42978eafe79ed221731c512772a473 (diff) | |
| parent | 9e46449178fa8f47142a9132dcb78eeb54850f28 (diff) | |
| download | angler-e24f2ae4f46494d5e12b7d4243a7500db067882b.tar.gz | |
Merge "Don't use the STL in C projects."android-wear-8.0.0_r1
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/Android.mk | 1 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-test/Android.mk | 2 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 1 |
3 files changed, 4 insertions, 0 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 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 @@ 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) \ 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 @@ 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_ |