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

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

Merge "Use the global default cpp_std." into main am: 87559380 am: b31c7f26 

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



Change-Id: If564dcd40f8e077fe3c9718f9a91f08e1f2973a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f975446c b31c7f26

media/module/service.mediatranscoding/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ package { 
cc_defaults {

    name: "mediatranscodingservice_test_defaults",



    cpp_std: "gnu++17",

    cflags: [

        "-Wall",

        "-Werror",

media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ struct EventTracker { 
        enum { NoEvent, Start, Pause, Resume, Finished, Failed } type;

        int64_t clientId;

        int32_t sessionId;



        friend bool operator==(const EventTracker::Event& lhs, const EventTracker::Event& rhs);

    };



#define DECLARE_EVENT(action)                                  \