commit 35c87b6ada2de0382084f51ebed8d696ff9d7c23
author Courtney Edwards <courtneyfe@chromium.org> Tue May 19 11:44:42 2020
committer Commit Bot <commit-bot@chromium.org> Tue May 19 13:23:25 2020
tree 2a6ce053ffe96b6c7e6eddc15983835b702ad507
parent b9148199443bd9422f2fc86cf0f8325575925a00

Remove android_manifest_for_lint from BUILD.gn files


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: If526d9a4dd80cddca7f2c9dd7f67ba9efe3f1a84
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175661
Commit-Queue: Courtney Edwards <courtneyfe@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31325}

examples/BUILD.gn

diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 4d6d14d..2acb0dd 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -101,7 +101,7 @@
 
   rtc_android_library("AppRTCMobile_javalib") {
     testonly = true
-    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
+    android_manifest = "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 47e600a..e02f5d4 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -115,7 +115,7 @@
 
   rtc_android_library("NetworkTesterMobile_javalib") {
     testonly = true
-    android_manifest_for_lint = "androidapp/AndroidManifest.xml"
+    android_manifest = "androidapp/AndroidManifest.xml"
 
     sources = [
       "androidapp/src/com/google/media/networktester/MainActivity.java",

webrtc.gni

diff --git a/webrtc.gni b/webrtc.gni
index 4f1d001..3708345 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -1002,6 +1002,7 @@
       }
 
       no_build_hooks = true
+      not_needed(["android_manifest"])
     }
   }