commit c50976ace9e23c94b0c54d869de3eb8b87688cee
author Ilya Nikolaevskiy <ilnik@webrtc.org> Mon May 18 13:22:55 2020
committer Commit Bot <commit-bot@chromium.org> Mon May 18 13:23:09 2020
tree e3c1b3db38d0b456174e4b5a4a99ced0db28eaed
parent c3252467531ef565ebbe8144e3127b647d70a846

Revert "Remove android_manifest_for_lint from BUILD.gn files"

This reverts commit 340106ad4659faca563509016097a091bfb5289f.

Reason for revert: Broke internal project.

Original change's description:
> Remove android_manifest_for_lint from BUILD.gn files
> 
> The Chromium Roll into WebRTC isn't flowing
> The first CL that caused the problem is https://webrtc-review.googlesource.com/c/src/+/175140/
> The error is: ERROR at //examples/BUILD.gn:104:33: Assignment had no effect. android_manifest_for_lint = "androidapp/AndroidManifest.xml"
> android_manifest_for_lint has ben removed so update BUILD files that use that feature to reflect this.
> 
> BUG=None
> 
> Change-Id: Ic3eb16eab8e4a4ab87daac9998d7a07373fec493
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175569
> Commit-Queue: Courtney Edwards <courtneyfe@google.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31299}

TBR=mbonadei@webrtc.org,titovartem@webrtc.org,courtneyfe@google.com,courtneyfe@chromium.org

Change-Id: I6055b4363254d353d116805aac4ec63d7c5c7c59
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175622
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31303}

examples/BUILD.gn

diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 26d67d6..4d6d14d 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -101,6 +101,7 @@
 
   rtc_android_library("AppRTCMobile_javalib") {
     testonly = true
+    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
 
     sources = [
       "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java",

rtc_tools/network_tester/BUILD.gn

diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 74b9403..47e600a 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -115,6 +115,7 @@
 
   rtc_android_library("NetworkTesterMobile_javalib") {
     testonly = true
+    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
 
     sources = [
       "androidapp/src/com/google/media/networktester/MainActivity.java",