diff options
author | Wilson Sung <wilsonsung@google.com> | 2021-05-24 13:57:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-24 13:57:27 +0000 |
commit | 9a3184f36f55252bb7d499fa49cedda973a5d51e (patch) | |
tree | b96ee8b826da69869e2aaf557f3fbb97f138b9b1 | |
parent | 866ea3ec8f2db9c68b8649b9ba048aaeb7cdcf27 (diff) | |
parent | c58b8b4e422232087e32d38b047b5a820ede39cc (diff) | |
download | display-9a3184f36f55252bb7d499fa49cedda973a5d51e.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C3.08.00.00.787.021' into sc-dev am: c58b8b4e42android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/display/+/14185526
Change-Id: Ib416a71d160bd8b6a84623b3129d1a8b21c0fe44
-rw-r--r-- | gpu_tonemapper/Android.mk | 3 |
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 \ |