diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
| commit | 92de554adbf95a303f1051d85bef05abac9f1e8a (patch) | |
| tree | 17019c03731e797280398e58b99044862341834a /pjmedia/build | |
| parent | 2c2752f536e55bff7055eed2ed8e558163e1f9b6 (diff) | |
Re #1639: merged android branch into trunk (except sample apps, i.e: apjsua & apjloader)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4435 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
| -rw-r--r-- | pjmedia/build/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index d30e6bca..39b8d65a 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -81,7 +81,8 @@ export PJMEDIA_CFLAGS += $(_CFLAGS) export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ - alsa_dev.o bb10_dev.o bdimad_dev.o + alsa_dev.o bb10_dev.o bdimad_dev.o \ + android_jni_dev.o opensl_dev.o export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) |