Skip to content

GitLab

T
tangled
Commit 70968017 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot
Browse files
Options

Rename font-related Chrome resources 

Rename font-related Chrome resources to avoid resource name clash
with internal Chrome library which duplicates the font resources

BUG=1129255

Change-Id: I027e2295f5cbc173c9a0de235bcee30cd5b9b8ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2415533
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarJustin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813436}
parent fc7a29d9
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 22 deletions
chrome/android/BUILD.gn
View file @ 70968017
......@@ -160,9 +160,10 @@ generate_ui_locale_resources("ui_locale_string_resources") {
android_resources("chrome_base_module_resources") {
sources = [
"java/res_base/anim/no_anim.xml",
"java/res_base/font/google_sans.xml",
"java/res_base/font/google_sans_bold.xml",
"java/res_base/font/google_sans_medium.xml",
"java/res_base/font/chrome_google_sans.xml",
"java/res_base/font/chrome_google_sans_bold.xml",
"java/res_base/font/chrome_google_sans_medium.xml",
"java/res_base/values/fonts.xml",
"java/res_base/values/ic_launcher_alias.xml",
"java/res_base/values/ic_launcher_round_alias.xml",
"java/res_base/values/preloaded_fonts.xml",
......
chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
View file @ 70968017
......@@ -828,7 +828,7 @@
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_google_sans_fonts"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: a5e78e63
android:authorities="$PACKAGE.LicenseContentProvider"
android:exported="true"
......
chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
View file @ 70968017
......@@ -782,7 +782,7 @@
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_google_sans_fonts"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: 97e158a1
android:authorities="$PACKAGE.DownloadFileProvider"
android:exported="false"
......
chrome/android/java/AndroidManifest.xml
View file @ 70968017
......@@ -1243,7 +1243,7 @@ by a child template that "extends" this file.
<!-- Downloads Google Sans from GMS Core -->
<meta-data android:name="preloaded_fonts"
android:resource="@array/preloaded_google_sans_fonts" />
android:resource="@array/chrome_preloaded_google_sans_fonts" />
{% block base_application_definitions %}
{% endblock %}
......
chrome/android/java/res_base/font/google_sans.xml → chrome/android/java/res_base/font/chrome_google_sans.xml
View file @ 70968017
......@@ -9,10 +9,10 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
android:fontProviderAuthority="com.google.android.gms.fonts"
android:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
android:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
android:fontProviderPackage="com.google.android.gms"
android:fontProviderQuery="Google Sans"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Google Sans" />
chrome/android/java/res_base/font/google_sans_bold.xml → chrome/android/java/res_base/font/chrome_google_sans_bold.xml
View file @ 70968017
......@@ -9,10 +9,10 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
android:fontProviderAuthority="com.google.android.gms.fonts"
android:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
android:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
android:fontProviderPackage="com.google.android.gms"
android:fontProviderQuery="Google Sans:700"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Google Sans:700"/>
chrome/android/java/res_base/font/google_sans_medium.xml → chrome/android/java/res_base/font/chrome_google_sans_medium.xml
View file @ 70968017
......@@ -9,10 +9,10 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
android:fontProviderAuthority="com.google.android.gms.fonts"
android:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
android:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
android:fontProviderPackage="com.google.android.gms"
android:fontProviderQuery="Google Sans:500"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Google Sans:500"/>
chrome/android/java/res_base/values/fonts.xml 0 → 100644
View file @ 70968017
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 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.
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<item tools:ignore="UnusedResources" type="font" format="reference" name="google_sans">@font/chrome_google_sans</item>
<item tools:ignore="UnusedResources" type="font" format="reference" name="google_sans_medium">@font/chrome_google_sans_medium</item>
</resources>
chrome/android/java/res_base/values/preloaded_fonts.xml
View file @ 70968017
......@@ -5,12 +5,12 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<!-- Fonts that are specified to be preloaded by AndroidManifest.xml. -->
<array name="preloaded_google_sans_fonts">
<array name="chrome_preloaded_google_sans_fonts">
<!-- The following 2 fonts are used in downstream Clank UI. -->
<item>@font/google_sans</item>
<item>@font/google_sans_medium</item>
<item>@font/chrome_google_sans</item>
<item>@font/chrome_google_sans_medium</item>
<!-- The following font is not used in Clank UI, but may be used by
AndroidFontLookupImpl#matchLocalFontByUniqueName. -->
<item>@font/google_sans_bold</item>
<item>@font/chrome_google_sans_bold</item>
</array>
</resources>
content/public/android/java/src/org/chromium/content/browser/font/AndroidFontLookupImpl.java
View file @ 70968017
......@@ -208,7 +208,7 @@ public class AndroidFontLookupImpl implements AndroidFontLookup {
}
FontRequest request = new FontRequest("com.google.android.gms.fonts",
"com.google.android.gms", query, R.array.com_google_android_gms_fonts_certs);
"com.google.android.gms", query, R.array.ui_com_google_android_gms_fonts_certs);
try {
long startTimeMs = SystemClock.elapsedRealtime();
......
ui/android/java/res/values/font_certs.xml
View file @ 70968017
......@@ -4,16 +4,20 @@
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<array name="com_google_android_gms_fonts_certs">
<item>@array/com_google_android_gms_fonts_certs_dev</item>
<item>@array/com_google_android_gms_fonts_certs_prod</item>
<!--
The 'ui_' resource name prefix is to avoid clashing with a downstream duplicate
resource with the same name. See crbug.com/1129255
-->
<array name="ui_com_google_android_gms_fonts_certs">
<item>@array/ui_com_google_android_gms_fonts_certs_dev</item>
<item>@array/ui_com_google_android_gms_fonts_certs_prod</item>
</array>
<string-array name="com_google_android_gms_fonts_certs_dev" translatable="false">
<string-array name="ui_com_google_android_gms_fonts_certs_dev" translatable="false">
<item>
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
</item>
</string-array>
<string-array name="com_google_android_gms_fonts_certs_prod" translatable="false">
<string-array name="ui_com_google_android_gms_fonts_certs_prod" translatable="false">
<item>
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
</item>
......
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