Skip to content

GitLab

T
tangled
Commit 94fc8d93 authored by Peter Wen's avatar Peter Wen Committed by Commit Bot
Browse files
Options

Reland "Android: Turn on UnusedResources lint check" 

Original CL: http://crrev.com/c/578488

Fixes: Cronet builders

TBR=hanxi@chromium.org,agrieve@chromium.org,yuweih@chromium.org

Bug: 731159
Change-Id: I6a54dfbae76c1d55166dbcaaea7bbbc93e60bf34
Reviewed-on: https://chromium-review.googlesource.com/580267
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488380}
parent bcce8b13
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 44 deletions
build/android/lint/suppressions.xml
View file @ 94fc8d93
...@@ -297,46 +297,28 @@ Still reading? ...@@ -297,46 +297,28 @@ Still reading?
</issue> </issue>
<!-- Our generated enums are allowed to have the same values. --> <!-- Our generated enums are allowed to have the same values. -->
<issue id="UniqueConstants" severity="ignore"/> <issue id="UniqueConstants" severity="ignore"/>
<!-- TODO(crbug.com/635567): Fix this properly. --> <!-- Please add rationale to each UnusedResources suppression. -->
<issue id="UnusedResources" severity="ignore"/>
<issue id="UnusedResources"> <issue id="UnusedResources">
<!-- The two dimens below will be changing soon so please leave them in --> <!-- These 3 raw resources are accessed by URL in various places -->
<ignore regexp="PRODUCT_DIR/gen/remoting/android/.*/res/raw/credits.html"/>
<ignore regexp="PRODUCT_DIR/gen/remoting/android/.*/res/raw/credits_css.css"/>
<ignore regexp="PRODUCT_DIR/gen/remoting/android/.*/res/raw/credits_js.js"/>
<!-- The 2 dimens override support library's res, will be changing soon -->
<ignore regexp="design_bottom_navigation_text_size"/> <ignore regexp="design_bottom_navigation_text_size"/>
<ignore regexp="design_bottom_navigation_active_text_size"/> <ignore regexp="design_bottom_navigation_active_text_size"/>
<ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits.html"/> <!-- This 1 string is used in CronetSmokeTestCase dynamically -->
<ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits_css.css"/> <ignore regexp="R.string.TestSupportImplClass"/>
<ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits_js.js"/> <!-- TODO(iuliah@google.com): Remove suppression when wired up -->
<ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/main.css"/> <ignore regexp="chrome/android/java/res/layout/signin_promo_view.xml"/>
<ignore regexp="R.dimen.signin_promo_account_image_size"/>
<ignore regexp="R.dimen.signin_promo_cold_state_image_size"/>
<!-- TODO(wnwen): Clean up the suppressions below this comment -->
<ignore regexp="android_ui_strings.xml"/> <ignore regexp="android_ui_strings.xml"/>
<ignore regexp="android_webview/java/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png"/> <ignore regexp="android_webview/java/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png"/>
<ignore regexp="android_webview/test/shell/res/raw/resource_file.html"/> <ignore regexp="android_webview/test/shell/res/raw/resource_file.html"/>
<ignore regexp="android_webview/test/shell/res/raw/resource_icon.png"/> <ignore regexp="android_webview/test/shell/res/raw/resource_icon.png"/>
<ignore regexp="android_webview/tools/automated_ui_tests/java/res/"/> <ignore regexp="android_webview/tools/automated_ui_tests/java/res/"/>
<!-- TODO(crbug.com/635567): Fix this properly. -->
<ignore regexp="chrome/android/java/res/drawable-hdpi/*"/> <ignore regexp="chrome/android/java/res/drawable-hdpi/*"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/cvc_icon.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/cvc_icon_amex.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/ic_settings.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_3d_blocked.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_autofill_cc.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_blocked_popups.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_camera.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_chrome.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_desktop_notifications.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_geolocation.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_microphone.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_midi.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_multiple_downloads.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_protected_media_identifier.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_restore.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/infobar_screen_share.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/mir_card.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/pageinfo_bad.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/pageinfo_good.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/pageinfo_warning.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/pr_generic.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/shortcut_incognito.png"/>
<ignore regexp="chrome/android/java/res/drawable-hdpi/shortcut_newtab.png"/>
<ignore regexp="chrome/android/java/res/drawable-nodpi/missing.png"/> <ignore regexp="chrome/android/java/res/drawable-nodpi/missing.png"/>
<ignore regexp="chrome/android/java/res/values-v17/styles.xml"/> <ignore regexp="chrome/android/java/res/values-v17/styles.xml"/>
<ignore regexp="chromecast/browser/android/apk/res/values/strings.xml"/> <ignore regexp="chromecast/browser/android/apk/res/values/strings.xml"/>
......
chrome/android/webapk/shell_apk/BUILD.gn
View file @ 94fc8d93
...@@ -151,9 +151,13 @@ android_library("webapk_java") { ...@@ -151,9 +151,13 @@ android_library("webapk_java") {
"src/org/chromium/webapk/shell_apk/WebApkUtils.java", "src/org/chromium/webapk/shell_apk/WebApkUtils.java",
] ]
deps = [ deps = [
":shell_apk_manifest",
":shell_apk_resources", ":shell_apk_resources",
"//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:common_java",
] ]
# Manifest used for linting (determining unused resources).
android_manifest = shell_apk_manifest
} }
template("webapk_tmpl") { template("webapk_tmpl") {
......
remoting/android/client_java_tmpl.gni
View file @ 94fc8d93
...@@ -79,6 +79,7 @@ template("remoting_android_client_java_tmpl") { ...@@ -79,6 +79,7 @@ template("remoting_android_client_java_tmpl") {
deps = [ deps = [
"//base:base_java", "//base:base_java",
"//remoting/android:remoting_android_client_java_resources", "//remoting/android:remoting_android_client_java_resources",
"//remoting/android:remoting_apk_manifest",
"//third_party/android_tools:android_support_annotations_java", "//third_party/android_tools:android_support_annotations_java",
"//third_party/android_tools:android_support_compat_java", "//third_party/android_tools:android_support_compat_java",
"//third_party/android_tools:android_support_core_ui_java", "//third_party/android_tools:android_support_core_ui_java",
...@@ -87,6 +88,9 @@ template("remoting_android_client_java_tmpl") { ...@@ -87,6 +88,9 @@ template("remoting_android_client_java_tmpl") {
"//ui/android:ui_utils_java", "//ui/android:ui_utils_java",
] ]
# Manifest used for linting (determining unused resources).
android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
deps += [ invoker.remoting_google_play_services_library ] deps += [ invoker.remoting_google_play_services_library ]
} }
} }
remoting/android/java/res/layout/account_selected.xml deleted 100644 → 0
View file @ bcce8b13
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:singleLine="true"
android:ellipsize="end"
style="@style/NavigationTextStyle"/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment