summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilson Sung <wilsonsung@google.com>2021-05-24 14:27:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-24 14:27:51 +0000
commit73c76c364c8179d212f917c72607a761e0c48347 (patch)
treeb96ee8b826da69869e2aaf557f3fbb97f138b9b1
parenta86a110841a8c30f0bb530292656394b1a7eba65 (diff)
parent7db3321b2397583d02e4ac81620768756ccdfbe2 (diff)
downloaddisplay-73c76c364c8179d212f917c72607a761e0c48347.tar.gz
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C3.08.00.00.787.021' into sc-dev am: c58b8b4e42 am: 9a3184f36f am: 7db3321b23
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/display/+/14185526 Change-Id: I2c7ab2875440b778d91768459a03f17e54cebb08
-rw-r--r--gpu_tonemapper/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 0e999b87..845cc5f3 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -19,7 +19,8 @@ LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \
- -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\"
+ -Wno-unused-parameter -Wno-unreachable-code-loop-increment \
+ -DLOG_TAG=\"GPU_TONEMAPPER\"
LOCAL_SRC_FILES := TonemapFactory.cpp \
glengine.cpp \