admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Android: Remove min_sdk_version in GN"

Browse Source 
This reverts commit f00ed5be2a6c5c0e67b1e40710f62e0b54b185f0.

Reason for revert: Broke compile on Android64 Builder arm64:
https://ci.chromium.org/p/webrtc/builders/ci/Android64%20Builder%20arm64/6936?

Original change's description:
> Android: Remove min_sdk_version in GN
> 
> Android lint is changing, so min_sdk_version is no longer needed in GN.
> 
> Can commit after this CL lands: https://crrev.com/c/2163728
> 
> Bug: chromium:1017190
> Change-Id: I5792df1f06c07cde3e3b17fd5f18a8f9ffcf380c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173840
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Peter Wen <wnwen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#31175}

TBR=mbonadei@webrtc.org,wnwen@chromium.org

Change-Id: Ieefb023dc8b8cc1b4665448be576cd21f816a07f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1017190
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174600
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31177}
This commit is contained in:
Scott Little 2020-05-06 21:14:45 +00:00 committed by Commit Bot
parent 42c59525b1
commit d6b10943c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc.gni
View File

@ -992,6 +992,14 @@ if (is_android) {
# Treat warnings as errors. # Treat warnings as errors.
errorprone_args += [ "-Werror" ] errorprone_args += [ "-Werror" ]
# WebRTC supports API level 16 while Chromium only supports 19.
# (the manifest defines minimum supported SDK version)
if (defined(invoker.min_sdk_version)) {
min_sdk_version = invoker.min_sdk_version
} else {
min_sdk_version = 16
}
# Add any arguments defined by the invoker. # Add any arguments defined by the invoker.
if (defined(invoker.errorprone_args)) { if (defined(invoker.errorprone_args)) {
errorprone_args += invoker.errorprone_args errorprone_args += invoker.errorprone_args