From 35c87b6ada2de0382084f51ebed8d696ff9d7c23 Mon Sep 17 00:00:00 2001 From: Courtney Edwards Date: Tue, 19 May 2020 13:44:42 +0200 Subject: [PATCH] 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 Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#31325} --- examples/BUILD.gn | 2 +- rtc_tools/network_tester/BUILD.gn | 2 +- webrtc.gni | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 4d6d14d0d9..2acb0dd70f 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -101,7 +101,7 @@ if (is_android) { 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", diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index 47e600aa85..e02f5d4242 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -115,7 +115,7 @@ if (is_android) { 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", diff --git a/webrtc.gni b/webrtc.gni index 4f1d0017f8..3708345685 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -1002,6 +1002,7 @@ if (is_android) { } no_build_hooks = true + not_needed(["android_manifest"]) } }