| commit | b0b7620365ef22e2175edc9a2df29bb1ef19be80 | [log] [tgz] |
|---|---|---|
| author | John Stultz <jstultz@google.com> | Mon Jul 01 23:21:34 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 01 23:21:34 2024 +0000 |
| tree | 985afaba4dfdec6b4956093d87c0936f3a103f99 | |
| parent | 245f572ed5a7a8c150ae70fa7a4134e803833570 [diff] | |
| parent | a93cbdde8fe8a362afbb462e5aa0de417a9f4e2c [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: a93cbdde8f Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/3155237 Change-Id: I4d763303c703d743ea684a7230ef1a62ca69fe90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index 62c7e0c..78e5443 100644 --- a/Android.bp +++ b/Android.bp
@@ -62,7 +62,6 @@ cppflags: [ "-DHWC2_INCLUDE_STRINGIFICATION", "-DHWC2_USE_CPP11", - "-std=c++17", ], relative_install_path: "hw",