diff options
| author | leozwang@google.com <leozwang@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-06-07 17:24:39 +0000 |
|---|---|---|
| committer | leozwang@google.com <leozwang@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-06-07 17:24:39 +0000 |
| commit | 0b0c28c49554dd961325e0cd7eee7525939a7d95 (patch) | |
| tree | 7299ec7fa65ce8ccba613cc2e79e882b4b141ce0 /android-webrtc.mk | |
| parent | e90067aca55eb2e503e5d1753efb8b020ef27e74 (diff) | |
| download | webrtc-0b0c28c49554dd961325e0cd7eee7525939a7d95.tar.gz | |
add android makefile, some modification in vpx makefile to build encoder from c source for now
Review URL: http://webrtc-codereview.appspot.com/29012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@50 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'android-webrtc.mk')
| -rw-r--r-- | android-webrtc.mk | 96 |
1 files changed, 46 insertions, 50 deletions
diff --git a/android-webrtc.mk b/android-webrtc.mk index db54b39496..f02d203077 100644 --- a/android-webrtc.mk +++ b/android-webrtc.mk @@ -7,15 +7,15 @@ # be found in the AUTHORS file in the root of the source tree. MY_APM_WHOLE_STATIC_LIBRARIES := \ - libwebrtc_spl \ - libwebrtc_resampler \ - libwebrtc_apm \ - libwebrtc_apm_utility \ - libwebrtc_vad \ - libwebrtc_ns \ - libwebrtc_agc \ - libwebrtc_aec \ - libwebrtc_aecm + libwebrtc_spl \ + libwebrtc_resampler \ + libwebrtc_apm \ + libwebrtc_apm_utility \ + libwebrtc_vad \ + libwebrtc_ns \ + libwebrtc_agc \ + libwebrtc_aec \ + libwebrtc_aecm LOCAL_PATH := $(call my-dir) @@ -31,9 +31,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libwebrtc_system_wrappers \ LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl \ - libstlport + libcutils \ + libdl \ + libstlport LOCAL_ADDITIONAL_DEPENDENCIES := @@ -52,47 +52,43 @@ LOCAL_MODULE_TAGS := optional LOCAL_LDFLAGS := LOCAL_WHOLE_STATIC_LIBRARIES := \ - libwebrtc_system_wrappers \ - libwebrtc_audio_device \ - libwebrtc_pcm16b \ - libwebrtc_cng \ - libwebrtc_audio_coding \ - libwebrtc_rtp_rtcp \ - libwebrtc_media_file \ - libwebrtc_udp_transport \ - libwebrtc_utility \ - libwebrtc_neteq \ - libwebrtc_audio_conference_mixer \ - libwebrtc_isac \ - libwebrtc_ilbc \ - libwebrtc_isacfix \ - libwebrtc_g722 \ - libwebrtc_g711 \ - libwebrtc_vplib \ - libwebrtc_video_render \ - libwebrtc_video_capture \ - libwebrtc_i420 \ - libwebrtc_video_coding \ - libwebrtc_video_processing \ - libwebrtc_vp8 \ - libwebrtc_video_mixer \ - libwebrtc_voe_core \ - libwebrtc_vie_core \ - libwebrtc_vpx_enc \ - libwebrtc_jpeg \ - libvpx - -#LOCAL_LDLIBS := -ljpeg + libwebrtc_system_wrappers \ + libwebrtc_audio_device \ + libwebrtc_pcm16b \ + libwebrtc_cng \ + libwebrtc_audio_coding \ + libwebrtc_rtp_rtcp \ + libwebrtc_media_file \ + libwebrtc_udp_transport \ + libwebrtc_utility \ + libwebrtc_neteq \ + libwebrtc_audio_conference_mixer \ + libwebrtc_isac \ + libwebrtc_ilbc \ + libwebrtc_isacfix \ + libwebrtc_g722 \ + libwebrtc_g711 \ + libwebrtc_voe_core \ + libwebrtc_video_render \ + libwebrtc_video_capture \ + libwebrtc_i420 \ + libwebrtc_video_coding \ + libwebrtc_video_processing \ + libwebrtc_vp8 \ + libwebrtc_vie_core \ + libwebrtc_vplib \ + libwebrtc_jpeg \ + libwebrtc_vpx LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl \ - libstlport \ - libjpeg \ - libGLESv2 \ - libOpenSLES \ - libwebrtc_audio_preprocessing + libcutils \ + libdl \ + libstlport \ + libjpeg \ + libGLESv2 \ + libOpenSLES \ + libwebrtc_audio_preprocessing LOCAL_ADDITIONAL_DEPENDENCIES := |