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

Suppress MissingPrefix using tools attribute

Browse Source 
Suppressing lint errors using comments is an undocumented feature of the
linter, and suppressing using the tools:ignore attribute should be
preferred.

Suppressing using comments becomes a problem when using the manifest
merger introduced in
6ada47bc79
as it reformats the comments slightly:
  <!--suppress MissingPrefix -->
becomes
  <!-- supress MissingPrefix -->
which causes the linter to disregard the suppression.

Bug: 740657
Change-Id: I8e365744d089271c390254e7c958b24b81043766
Reviewed-on: https://chromium-review.googlesource.com/566860
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Ingemar Ådahl <ingemara@opera.com>
Cr-Commit-Position: refs/heads/master@{#18971}
This commit is contained in:
Ingemar Ådahl 2017-07-11 11:56:15 +02:00 committed by Commit Bot
parent c024740b5e
commit 87b6ddb561
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/examples/androidapp/AndroidManifest.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.appspot.apprtc"
android:versionCode="1"
android:versionName="1.0">
@ -20,12 +21,12 @@
<uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
<!-- This is a test application that should always be debuggable. -->
<!--suppress HardcodedDebugMode -->
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:allowBackup="false"
android:debuggable="true"
android:supportsRtl="false">
android:supportsRtl="false"
tools:ignore="HardcodedDebugMode">
<activity android:name="ConnectActivity"
android:label="@string/app_name"

5
webrtc/examples/androidtests/AndroidManifest.xml
View File

@ -10,6 +10,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.appspot.apprtc.test">
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
@ -19,10 +20,10 @@
<uses-library android:name="android.test.runner" />
</application>
<!-- Needed for chromium-junit4 tag. crbug.com/640116
<!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
TODO(sakal): Remove once the tag is no longer needed. -->
<!--suppress MissingPrefix -->
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
tools:ignore="MissingPrefix"
android:targetPackage="org.appspot.apprtc"
android:label="Tests for AppRTCMobile"
chromium-junit4="true"/>

5
webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
View File

@ -10,6 +10,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.webrtc">
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
@ -30,10 +31,10 @@
<uses-library android:name="android.test.runner" />
</application>
<!-- Needed for chromium-junit4 tag. crbug.com/640116
<!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
TODO(sakal): Remove once the tag is no longer needed. -->
<!--suppress MissingPrefix -->
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
tools:ignore="MissingPrefix"
android:targetPackage="org.webrtc"
android:label="Tests for WebRTC Android SDK"
chromium-junit4="true"/>