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

Commit 99498990 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

libdumputils: avoid set<const T> 

A container of const T uses std::allocator<const T>, which was an
undocumented libc++ extension that has been removed.

See https://github.com/llvm/llvm-project/pull/96319.

Bug: 349681543
Test: m libdumputils
Change-Id: Ie673d1f16ebe25050e4f04a2fce797cb6a98f2d9
parent 8a56df68

libs/dumputils/dump_utils.cpp

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */

#include <set>

#include <utility>



#include <android-base/file.h>

#include <android-base/parseint.h>
@@ -115,7 +116,7 @@ static const std::vector<std::string> aidl_interfaces_to_dump { 


/* list of extra hal interfaces to dump containing process during native dumps */

// This is filled when dumpstate is called.

static std::set<const std::string> extra_hal_interfaces_to_dump;

static std::set<std::string> extra_hal_interfaces_to_dump;



static void read_extra_hals_to_dump_from_property() {

    // extra hals to dump are already filled
@@ -129,7 +130,7 @@ static void read_extra_hals_to_dump_from_property() { 
        if (trimmed_token.length() == 0) {

            continue;

        }

        extra_hal_interfaces_to_dump.insert(trimmed_token);

        extra_hal_interfaces_to_dump.insert(std::move(trimmed_token));

    }

}