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

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

Merge "Remove voodoo." into main am: 8b021633 am: b1040a69 

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



Change-Id: I57f15fc195d24b385e7f90de3ea0efc4b21a889a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25873c1b b1040a69

services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#pragma once



#define __STDC_LIMIT_MACROS

#include <inttypes.h>



#include <sys/types.h>

services/audiopolicy/service/AudioPolicyService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
//#define LOG_NDEBUG 0



#include "Configuration.h"

#undef __STRICT_ANSI__

#define __STDINT_LIMITS

#define __STDC_LIMIT_MACROS

#include <stdint.h>

#include <sys/time.h>

#include <dlfcn.h>