From f97b68078ac4b3219d840956414cb3f27893246a Mon Sep 17 00:00:00 2001 From: "leozwang@google.com" Date: Wed, 13 Jul 2011 17:49:49 +0000 Subject: [PATCH] Change android makefile to reflect recent file structure change Review URL: http://webrtc-codereview.appspot.com/67001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@200 4adac7df-926f-26a2-2b94-8c16560cd09d --- Android.mk | 81 +++++++++++++++++++++++++++--------------------------- libvpx.mk | 4 +-- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Android.mk b/Android.mk index 88274e5f3..378a026f2 100644 --- a/Android.mk +++ b/Android.mk @@ -9,43 +9,43 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir) # voice -include $(MY_WEBRTC_ROOT_PATH)/common_audio/resampler/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/common_audio/signal_processing_library/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/common_audio/vad/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/NetEQ/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/CNG/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/G711/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/G722/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/PCM16B/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/iLBC/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/iSAC/fix/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/codecs/iSAC/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_coding/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_conference_mixer/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_device/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/aec/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/aecm/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/agc/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/ns/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/utility/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/media_file/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/rtp_rtcp/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/udp_transport/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/utility/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/system_wrappers/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/voice_engine/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing_library/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/NetEQ/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/CNG/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/udp_transport/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/source/Android.mk # video -include $(MY_WEBRTC_ROOT_PATH)/common_video/jpeg/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/common_video/vplib/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_capture/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_coding/codecs/i420/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_coding/codecs/vp8/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_coding/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_processing/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/modules/video_render/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/video_engine/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_video/jpeg/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_video/vplib/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_capture/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/codecs/i420/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/codecs/vp8/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_processing/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_render/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/source/Android.mk # third party include $(MY_WEBRTC_ROOT_PATH)/libvpx.mk @@ -54,8 +54,9 @@ include $(MY_WEBRTC_ROOT_PATH)/libvpx.mk include $(MY_WEBRTC_ROOT_PATH)/android-webrtc.mk # build test apps -#include $(MY_WEBRTC_ROOT_PATH)/modules/audio_processing/main/test/process_test/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/voice_engine/main/test/cmd_test/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/voice_engine/main/test/auto_test/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/video_engine/main/test/AutoTest/android/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/video_engine/main/test/android_test/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/process_test/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/unit_test/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/cmd_test/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/AutoTest/android/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/android_test/Android.mk diff --git a/libvpx.mk b/libvpx.mk index ecaf15797..07c04dc58 100644 --- a/libvpx.mk +++ b/libvpx.mk @@ -91,8 +91,8 @@ LOCAL_SRC_FILES = \ $(MY_LIBVPX_PATH)/vp8/decoder/arm/arm_dsystemdependent.c \ LOCAL_CFLAGS := \ - -DHAVE_CONFIG_H=vpx_config.h \ - -include $(LOCAL_PATH)/third_party_mods/libvpx/source/config/android/vpx_config.h + -DHAVE_CONFIG_H=vpx_config.h \ + -include $(LOCAL_PATH)/third_party/libvpx/source/config/android/vpx_config.h LOCAL_MODULE := libwebrtc_vpx