Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65922df0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Remove obsolete workaround." into main am: 721db6f8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3450728



Change-Id: Ie047889299d89e6d3d890cc22a7bec3837c56c6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63592c03 721db6f8

media/codec2/hal/client/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ cc_library { 
        "libcodec2-aidl-client-defaults",

    ],



    // http://b/343951602#comment4 Explicitly set cpp_std to gnu++20.  The

    // default inherited from libcodec2-impl-defaults sets it to gnu++17 which

    // causes a segfault when mixing global std::string symbols built with

    // gnu++17 and gnu++20.  TODO(b/343951602): clean this after

    // libcodec2-impl-defaults opt into gnu++17 is removed.

    cpp_std: "gnu++20",



    header_libs: [

        "libcodec2_internal", // private

        "libcom.android.media.swcodec.apexcodecs-header",

media/codec2/hal/client/client.cpp

+2 −0
Original line number Diff line number Diff line
@@ -77,12 +77,14 @@ 
#include <private/android/AHardwareBufferHelpers.h>

#include <system/window.h> // for NATIVE_WINDOW_QUERY_*



#include <algorithm>

#include <deque>

#include <iterator>

#include <limits>

#include <map>

#include <mutex>

#include <optional>

#include <ranges>

#include <sstream>

#include <thread>

#include <type_traits>