From eed2fcaa7631d7023c99f6480a268f9e9468f57a Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 16 Mar 2015 09:00:15 +0000 Subject: [PATCH] Roll chromium_revision 00e438c..8d51d96 (320241:320682) Relevant changes: * src/third_party/android_tools: fd5a8ec..98a4345 Details: https://chromium.googlesource.com/chromium/src/+/00e438c..8d51d96/DEPS This required updating our Android projects to API level 22, as third_party/android_tools dropped support for API level 21. Command used: perl -pi -e "s/android-21/android-22/g" `find . -name project.properties` Using 'android update project' would also work but that changes the ANDROID_SDK_ROOT -> ANDROID_HOME, which the Chromium build toolchain doesn't set properly when build/android/envsetup.sh is sourced. Clang version was not updated in this roll. R=henrika@webrtc.org, perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/42779004 Cr-Commit-Position: refs/heads/master@{#8728} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8728 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- talk/app/webrtc/androidtests/project.properties | 2 +- talk/examples/android/project.properties | 2 +- talk/examples/androidtests/project.properties | 2 +- webrtc/examples/android/media_demo/project.properties | 2 +- webrtc/examples/android/opensl_loopback/project.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 1a7c5e3f2..0f472d80a 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '00e438cd22c5e2f26d003c15c0a1621aa24acd0c', + 'chromium_revision': '8d51d96bcb3ea92bf4e6caeb00e5b0061e8e3002', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/talk/app/webrtc/androidtests/project.properties b/talk/app/webrtc/androidtests/project.properties index 47b70783f..a6ca533fe 100644 --- a/talk/app/webrtc/androidtests/project.properties +++ b/talk/app/webrtc/androidtests/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 java.compilerargs=-Xlint:all -Werror diff --git a/talk/examples/android/project.properties b/talk/examples/android/project.properties index 47b70783f..a6ca533fe 100644 --- a/talk/examples/android/project.properties +++ b/talk/examples/android/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 java.compilerargs=-Xlint:all -Werror diff --git a/talk/examples/androidtests/project.properties b/talk/examples/androidtests/project.properties index 47b70783f..a6ca533fe 100644 --- a/talk/examples/androidtests/project.properties +++ b/talk/examples/androidtests/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 java.compilerargs=-Xlint:all -Werror diff --git a/webrtc/examples/android/media_demo/project.properties b/webrtc/examples/android/media_demo/project.properties index 8ee39b95d..496053322 100644 --- a/webrtc/examples/android/media_demo/project.properties +++ b/webrtc/examples/android/media_demo/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 diff --git a/webrtc/examples/android/opensl_loopback/project.properties b/webrtc/examples/android/opensl_loopback/project.properties index 47b70783f..a6ca533fe 100644 --- a/webrtc/examples/android/opensl_loopback/project.properties +++ b/webrtc/examples/android/opensl_loopback/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 java.compilerargs=-Xlint:all -Werror