diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-02-15 09:47:55 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-02-15 09:47:55 +0000 |
| commit | 0a57aae75b4deaeb2cc9a9295eddfdafaaab1c73 (patch) | |
| tree | 24186bfe169c0f6ea5c0c715332c56c0492e4c53 /Android.mk | |
| parent | 38a0d28d35876f3302a00be388239acac5f0e9ad (diff) | |
| download | webrtc-0a57aae75b4deaeb2cc9a9295eddfdafaaab1c73.tar.gz | |
Converted old jpeg_test tool to gtest unit test.
Restructured paths to new directory layout.
Stefan: common_video/*
Magnus: video_engine/*
Niklas: Android.mk
BUG=
TEST=jpeg_unittests on Debug+Release on Linux, Mac, Windows. Valgrind on Linux passes without warnings.
Review URL: https://webrtc-codereview.appspot.com/388007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1691 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b626394b6c..b7c28e6d0d 100644 --- a/Android.mk +++ b/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 @@ -37,7 +37,7 @@ 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)/src/common_video/jpeg/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_video/jpeg/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/common_video/libyuv/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 |