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

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

Merge "Remove `extern "C"` around `#include "gsm.h"`." am: 8e733cad am:... 

Merge "Remove `extern "C"` around `#include "gsm.h"`." am: 8e733cad am: f1a0d9ea am: 66993734 am: 35a35269

Change-Id: I297cdffefe8c5eaa24f30aff6519979a30357a2e
parents 50f7b0b9 35a35269

media/codec2/components/gsm/C2SoftGsmDec.h

+1 −4
Original line number Diff line number Diff line
@@ -19,10 +19,7 @@ 


#include <SimpleC2Component.h>





extern "C" {

#include "gsm.h"

}



namespace android {

media/libstagefright/codecs/gsm/dec/SoftGSM.h

+0 −2
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ 


#include <media/stagefright/omx/SimpleSoftOMXComponent.h>



extern "C" {

#include "gsm.h"

}



namespace android {