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

Commit 02cc0ecc authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolve merge conflicts of 58fc59b9 to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: weekend merge conflict resolution
Change-Id: I70002ccad145f7b5fa4854d6aa192322b07849e9
parents 250cbc71 58fc59b9

media/libaaudio/examples/loopback/src/loopback.cpp

+3 −0
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ 
#include <algorithm>

#include <assert.h>

#include <cctype>

#include <errno.h>

#include <math.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include <aaudio/AAudio.h>

media/libaaudio/examples/utils/AAudioExampleUtils.h

+2 −0
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
#define AAUDIO_EXAMPLE_UTILS_H



#include <atomic>

#include <errno.h>

#include <linux/futex.h>

#include <sched.h>

#include <string.h>

#include <sys/syscall.h>

#include <unistd.h>

media/libaaudio/src/utility/AudioClock.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef UTILITY_AUDIO_CLOCK_H

#define UTILITY_AUDIO_CLOCK_H



#include <errno.h>

#include <stdint.h>

#include <time.h>

services/oboeservice/SharedMemoryProxy.cpp

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

#include <log/log.h>



#include <errno.h>

#include <string.h>



#include <aaudio/AAudio.h>

#include "SharedMemoryProxy.h"