summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2014-10-31 23:26:10 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org>2014-10-31 23:26:10 +0000
commit11643cc977452e31faabc19836e41d0924762552 (patch)
treed530efe7f5d3529b7d499bf98e17aff84d14ef52
parent3434a47882aa5e8e70a9cb6a3b57e6a549f63778 (diff)
downloadtalk-11643cc977452e31faabc19836e41d0924762552.tar.gz
Update Android projects to API level 21.
The update in https://webrtc-codereview.appspot.com/23309004 was not enough, so this updates to 21 instead. This is required in order to roll chromium_revision to keep up with Chrome, as third_party/android_tools have now dropped support for API level 20. Commands used: third_party/android_tools/sdk/tools/android update project --name OpenSlDemo --target android-21 --path webrtc/examples/android/opensl_loopback third_party/android_tools/sdk/tools/android update project --name WebRTCDemo --target android-21 --path webrtc/examples/android/media_demo/ third_party/android_tools/sdk/tools/android update project --name AppRTCDemo --target android-21 --path talk/examples/android/ Then I restored the changes of the ANDROID_SDK_ROOT -> ANDROID_HOME since it seems the Chromium build toolchain doesn't set it properly when build/android/envsetup.sh is sourced. BUG= R=glaznev@webrtc.org, henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25029004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7587 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--examples/android/project.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/android/project.properties b/examples/android/project.properties
index 4c19267..47b7078 100644
--- a/examples/android/project.properties
+++ b/examples/android/project.properties
@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-20
+target=android-21
java.compilerargs=-Xlint:all -Werror