From 68d58602e275294746217f60f64f6eeee6c9591e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= <sakal@webrtc.org>
Date: Thu, 24 Jan 2019 12:56:12 +0100
Subject: [PATCH] Override default manifest from Chromium in WebRTC.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows rolling Chromium CL that removes API level 16 support:
https://chromium-review.googlesource.com/c/chromium/src/+/1423117

Bug: webrtc:10238, chromium:923477, chromium:922656
Change-Id: Icbed09256a4627dcae81230cd9a41a7f08c6a4d6
Reviewed-on: https://webrtc-review.googlesource.com/c/119580
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26389}
---
 webrtc.gni | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/webrtc.gni b/webrtc.gni
index 582071e1e2..2239d61eba 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -824,6 +824,16 @@ if (is_android) {
       # Treat warnings as errors.
       errorprone_args += [ "-Werror" ]
 
+      # WebRTC supports API level 16 while Chromium only supports 19.
+      # (the manifest defines minimum supported SDK version)
+      if (defined(invoker.android_manifest_for_lint)) {
+        # Custom manifest defined by the target, use that one.
+        android_manifest_for_lint = invoker.android_manifest_for_lint
+      } else {
+        # Default manifest for WebRTC.
+        android_manifest_for_lint = "//sdk/android/AndroidManifest.xml"
+      }
+
       # TODO(crbug.com/824679): Find out why this fails in Chromium
       if (!build_with_chromium) {
         errorprone_args += [