diff options
| author | solenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-11 15:27:49 +0000 |
|---|---|---|
| committer | solenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-11 15:27:49 +0000 |
| commit | 800136d2ca86bc644a2914db8f4a11b13a21dcaa (patch) | |
| tree | 089e5a3e9aa78fbb7e02b14914b8d814715057d8 /video_engine/test/auto_test/android/jni/Android.mk | |
| parent | 2851916f57d2cedae9d99a0c3ab2769df55512d6 (diff) | |
| download | webrtc-800136d2ca86bc644a2914db8f4a11b13a21dcaa.tar.gz | |
Remove ViE external encryption API.
BUG=
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/8079005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5525 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/test/auto_test/android/jni/Android.mk')
| -rw-r--r-- | video_engine/test/auto_test/android/jni/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video_engine/test/auto_test/android/jni/Android.mk b/video_engine/test/auto_test/android/jni/Android.mk index 82a511f9..284ecabb 100644 --- a/video_engine/test/auto_test/android/jni/Android.mk +++ b/video_engine/test/auto_test/android/jni/Android.mk @@ -24,7 +24,6 @@ LOCAL_SRC_FILES := \ ../../source/vie_autotest_base.cc \
../../source/vie_autotest_capture.cc \
../../source/vie_autotest_codec.cc \
- ../../source/vie_autotest_encryption.cc \
../../source/vie_autotest_file.cc \
../../source/vie_autotest_image_process.cc \
../../source/vie_autotest_loopback.cc \
@@ -35,7 +34,7 @@ LOCAL_SRC_FILES := \ ../../source/tb_capture_device.cc \
../../source/tb_external_transport.cc \
../../source/tb_interfaces.cc \
- ../../source/tb_video_channel.cc
+ ../../source/tb_video_channel.cc
LOCAL_CFLAGS := \
'-DWEBRTC_TARGET_PC' \
@@ -57,7 +56,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
$(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
$(LOCAL_PATH)/../../../../../voice_engine/include \
- $(LOCAL_PATH)/../../../../../system_wrappers/interface
+ $(LOCAL_PATH)/../../../../../system_wrappers/interface
LOCAL_PRELINK_MODULE := false
@@ -69,7 +68,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2
# the following line is for NDK build
-LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc
+LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc
ifndef NDK_ROOT
include external/stlport/libstlport.mk
|