diff options
| -rw-r--r-- | core/jni/Android.mk | 4 | ||||
| -rw-r--r-- | core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index adeffadc628e..d53a5b80a9fb 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -261,7 +261,9 @@ LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libandroid_runtime -LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +# -Wno-unknown-pragmas: necessary for Clang as the GL bindings need to turn +# off a GCC warning that Clang doesn't know. +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unknown-pragmas include $(BUILD_SHARED_LIBRARY) diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp index 35e9a1c5a764..7dafb1b17e3c 100644 --- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp +++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp @@ -312,8 +312,8 @@ static status_t produceFrame(const sp<ANativeWindow>& anw, case HAL_PIXEL_FORMAT_BLOB: { int8_t* img = NULL; struct camera3_jpeg_blob footer = { - jpeg_blob_id: CAMERA3_JPEG_BLOB_ID, - jpeg_size: (uint32_t)bufferLength + .jpeg_blob_id = CAMERA3_JPEG_BLOB_ID, + .jpeg_size = (uint32_t)bufferLength }; size_t totalJpegSize = bufferLength + sizeof(footer); |