From ed9f705942a2f04e5ce0493aba808007dd5bc6b2 Mon Sep 17 00:00:00 2001 From: "leozwang@google.com" Date: Fri, 15 Jul 2011 17:25:27 +0000 Subject: [PATCH] Add include path to common_video/interface to android build Review URL: http://webrtc-codereview.appspot.com/65003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@215 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/main/source/Android.mk | 17 +++++++++-------- .../main/test/AutoTest/android/jni/Android.mk | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/video_engine/main/source/Android.mk b/src/video_engine/main/source/Android.mk index d3e3a22425..0243b79779 100644 --- a/src/video_engine/main/source/Android.mk +++ b/src/video_engine/main/source/Android.mk @@ -60,22 +60,23 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../modules/video_capture/main/interface \ - $(LOCAL_PATH)/../../../modules/video_render/main/interface \ - $(LOCAL_PATH)/../../../common_video/vplib/main/interface \ + $(LOCAL_PATH)/../../../common_video/interface \ $(LOCAL_PATH)/../../../common_video/jpeg/main/interface \ - $(LOCAL_PATH)/../../../modules/media_file/interface \ + $(LOCAL_PATH)/../../../common_video/vplib/main/interface \ $(LOCAL_PATH)/../../../modules/interface \ + $(LOCAL_PATH)/../../../modules/audio_coding/main/interface \ + $(LOCAL_PATH)/../../../modules/media_file/interface \ $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \ $(LOCAL_PATH)/../../../modules/udp_transport/interface \ $(LOCAL_PATH)/../../../modules/utility/interface \ - $(LOCAL_PATH)/../../../modules/audio_coding/main/interface \ - $(LOCAL_PATH)/../../../modules/video_coding/main/interface \ + $(LOCAL_PATH)/../../../modules/video_capture/main/interface \ $(LOCAL_PATH)/../../../modules/video_coding/codecs/interface \ + $(LOCAL_PATH)/../../../modules/video_coding/main/interface \ $(LOCAL_PATH)/../../../modules/video_mixer/main/interface \ $(LOCAL_PATH)/../../../modules/video_processing/main/interface \ - $(LOCAL_PATH)/../../../voice_engine/main/interface \ - $(LOCAL_PATH)/../../../system_wrappers/interface + $(LOCAL_PATH)/../../../modules/video_render/main/interface \ + $(LOCAL_PATH)/../../../system_wrappers/interface \ + $(LOCAL_PATH)/../../../voice_engine/main/interface # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS := diff --git a/src/video_engine/main/test/AutoTest/android/jni/Android.mk b/src/video_engine/main/test/AutoTest/android/jni/Android.mk index 7ef49a5738..c5d01231e3 100644 --- a/src/video_engine/main/test/AutoTest/android/jni/Android.mk +++ b/src/video_engine/main/test/AutoTest/android/jni/Android.mk @@ -48,13 +48,14 @@ LOCAL_C_INCLUDES := \ external/gtest/include \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../interface \ - $(LOCAL_PATH)/../../../../interface \ $(LOCAL_PATH)/../../../../../.. \ + $(LOCAL_PATH)/../../../../interface \ $(LOCAL_PATH)/../../../../source \ - $(LOCAL_PATH)/../../../../../../modules/video_render/main/interface \ + $(LOCAL_PATH)/../../../../../../common_video/interface \ $(LOCAL_PATH)/../../../../../../modules/interface \ $(LOCAL_PATH)/../../../../../../modules/video_capture/main/interface \ $(LOCAL_PATH)/../../../../../../modules/video_coding/codecs/interface \ + $(LOCAL_PATH)/../../../../../../modules/video_render/main/interface \ $(LOCAL_PATH)/../../../../../../voice_engine/main/interface \ $(LOCAL_PATH)/../../../../../../system_wrappers/interface