diff --git a/src/video_engine/main/test/android_test/Android.mk b/src/video_engine/main/test/android_test/Android.mk index 3ee8627dc1..4f65534675 100644 --- a/src/video_engine/main/test/android_test/Android.mk +++ b/src/video_engine/main/test/android_test/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -10,26 +10,18 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -MY_CAPTURE_FOLDER := ../../../../modules/video_capture/main/source -MY_CAPTURE_JAVA_FOLDER := Android/java/org/webrtc/videoengine -MY_CAPTURE_PATH := $(MY_CAPTURE_FOLDER)/$(MY_CAPTURE_JAVA_FOLDER) - -MY_RENDER_FOLDER := ../../../../modules/video_render/main/source -MY_RENDER_JAVA_FOLDER := Android/java/org/webrtc/videoengine -MY_RENDER_PATH := $(MY_RENDER_FOLDER)/$(MY_RENDER_JAVA_FOLDER) - LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ src/org/webrtc/videoengineapp/ViEAndroidDemo.java \ src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java \ src/org/webrtc/videoengineapp/IViEAndroidCallback.java \ - $(MY_CAPTURE_PATH)/CaptureCapabilityAndroid.java \ - $(MY_CAPTURE_PATH)/VideoCaptureAndroid.java \ - $(MY_CAPTURE_PATH)/VideoCaptureDeviceInfoAndroid.java \ - $(MY_RENDER_PATH)/ViEAndroidGLES20.java \ - $(MY_RENDER_PATH)/ViERenderer.java \ - $(MY_RENDER_PATH)/ViESurfaceRenderer.java + src/org/webrtc/videoengine/CaptureCapabilityAndroid.java \ + src/org/webrtc/videoengine/VideoCaptureAndroid.java \ + src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java \ + src/org/webrtc/videoengine/ViEAndroidGLES20.java \ + src/org/webrtc/videoengine/ViERenderer.java \ + src/org/webrtc/videoengine/ViESurfaceRenderer.java LOCAL_PACKAGE_NAME := webrtc-video-demo LOCAL_CERTIFICATE := platform diff --git a/src/video_engine/main/test/android_test/jni/Android.mk b/src/video_engine/main/test/android_test/jni/Android.mk index 4121cc6d26..35af493546 100644 --- a/src/video_engine/main/test/android_test/jni/Android.mk +++ b/src/video_engine/main/test/android_test/jni/Android.mk @@ -1,40 +1,81 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -LOCAL_PATH := $(call my-dir) - -INTERFACES_PATH := $(LOCAL_PATH)/../../../../../../../build/interface -LIBS_PATH := $(LOCAL_PATH)/../../../../../../../build/libraries - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := libwebrtc-video-demo-jni -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := vie_android_java_api.cc -LOCAL_CFLAGS := \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_ANDROID' - -LOCAL_C_INCLUDES := \ - external/gtest/include \ - $(LOCAL_PATH)/../../../../.. \ - $(LOCAL_PATH)/../../../../include \ - $(LOCAL_PATH)/../../../../../voice_engine/main/interface - -LOCAL_PRELINK_MODULE := false - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libstlport \ - libandroid \ - libwebrtc \ - libGLESv2 -LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc - -include $(BUILD_SHARED_LIBRARY) +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +LOCAL_PATH := $(call my-dir) + +MY_LIBS_PATH := $(LOCAL_PATH)/../../../../../../out/Release/obj.target + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests +LOCAL_MODULE := libwebrtc-video-demo-jni +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES := vie_android_java_api.cc +LOCAL_CFLAGS := \ + '-DWEBRTC_TARGET_PC' \ + '-DWEBRTC_ANDROID' + +LOCAL_C_INCLUDES := \ + external/gtest/include \ + $(LOCAL_PATH)/../../../../.. \ + $(LOCAL_PATH)/../../../../include \ + $(LOCAL_PATH)/../../../../../voice_engine/main/interface + +LOCAL_PRELINK_MODULE := false + +LOCAL_SHARED_LIBRARIES := \ + libstlport_shared + +LOCAL_LDLIBS := \ + -llog \ + -lgcc \ + -lGLESv2 \ + -lOpenSLES \ + $(MY_LIBS_PATH)/src/voice_engine/libvoice_engine_core.a \ + $(MY_LIBS_PATH)/src/video_engine/libvideo_engine_core.a \ + $(MY_LIBS_PATH)/src/modules/libvideo_processing.a \ + $(MY_LIBS_PATH)/src/modules/libwebrtc_video_coding.a \ + $(MY_LIBS_PATH)/src/modules/libvideo_render_module.a \ + $(MY_LIBS_PATH)/src/modules/libvideo_capture_module.a \ + $(MY_LIBS_PATH)/src/modules/libaudio_coding_module.a \ + $(MY_LIBS_PATH)/src/modules/libaudio_processing.a \ + $(MY_LIBS_PATH)/src/modules/libPCM16B.a \ + $(MY_LIBS_PATH)/src/modules/libCNG.a \ + $(MY_LIBS_PATH)/src/modules/libNetEq.a \ + $(MY_LIBS_PATH)/src/modules/libG722.a \ + $(MY_LIBS_PATH)/src/modules/libiSAC.a \ + $(MY_LIBS_PATH)/src/modules/libG711.a \ + $(MY_LIBS_PATH)/src/modules/libiLBC.a \ + $(MY_LIBS_PATH)/src/modules/libiSACFix.a \ + $(MY_LIBS_PATH)/src/common_audio/libvad.a \ + $(MY_LIBS_PATH)/src/modules/libns.a \ + $(MY_LIBS_PATH)/src/modules/libagc.a \ + $(MY_LIBS_PATH)/src/modules/libaec.a \ + $(MY_LIBS_PATH)/src/modules/libaecm.a \ + $(MY_LIBS_PATH)/src/common_audio/libresampler.a \ + $(MY_LIBS_PATH)/src/common_audio/libsignal_processing.a \ + $(MY_LIBS_PATH)/src/modules/libapm_util.a \ + $(MY_LIBS_PATH)/src/system_wrappers/source/libsystem_wrappers.a \ + $(MY_LIBS_PATH)/src/modules/libaudio_device.a \ + $(MY_LIBS_PATH)/src/modules/librtp_rtcp.a \ + $(MY_LIBS_PATH)/src/modules/libmedia_file.a \ + $(MY_LIBS_PATH)/src/modules/libudp_transport.a \ + $(MY_LIBS_PATH)/src/modules/libwebrtc_utility.a \ + $(MY_LIBS_PATH)/src/modules/libaudio_conference_mixer.a \ + $(MY_LIBS_PATH)/src/common_video/libwebrtc_libyuv.a \ + $(MY_LIBS_PATH)/third_party/libyuv/libyuv.a \ + $(MY_LIBS_PATH)/src/modules/libwebrtc_i420.a \ + $(MY_LIBS_PATH)/src/modules/libwebrtc_vp8.a \ + $(MY_LIBS_PATH)/src/common_video/libwebrtc_jpeg.a \ + $(MY_LIBS_PATH)/third_party/libjpeg_turbo/libjpeg_turbo.a \ + $(MY_LIBS_PATH)/src/modules/libaudioproc_debug_proto.a \ + $(MY_LIBS_PATH)/third_party/protobuf/libprotobuf_lite.a \ + $(MY_LIBS_PATH)/third_party/libvpx/libvpx.a + +include $(BUILD_SHARED_LIBRARY) + diff --git a/src/video_engine/main/test/android_test/jni/Application.mk b/src/video_engine/main/test/android_test/jni/Application.mk new file mode 100644 index 0000000000..647560e203 --- /dev/null +++ b/src/video_engine/main/test/android_test/jni/Application.mk @@ -0,0 +1,11 @@ +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# Build both ARMv5TE and ARMv7-A machine code. +APP_ABI := armeabi-v7a #armeabi armeabi-v7a x86 +APP_STL := stlport_static