Commit a1a25336 authored by Sky Malice's avatar Sky Malice Committed by Commit Bot

Move preloaded_fonts out of replacement block.

It was being erased when the extra_application_definitions block was
defined in downstream.

Bug: 1112002
Change-Id: I448f2c810e057ada6532907315897f754c1e3efd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427130Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarWenyu Fu <wenyufu@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810206}
parent 11ff8491
......@@ -207,6 +207,10 @@ by a child template that "extends" this file.
"com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
<!-- Downloads Google Sans from GMS Core -->
<meta-data android:name="preloaded_fonts"
android:resource="@array/preloaded_google_sans_fonts" />
<!-- Note: All activities directly or indirectly derived from ChromeActivity
must specify android:hardwareAccelerated="false".
......@@ -1215,11 +1219,6 @@ by a child template that "extends" this file.
controllers with its own list. -->
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS"
android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<!-- Downloads Google Sans from GMS Core -->
<meta-data android:name="preloaded_fonts"
android:resource="@array/preloaded_google_sans_fonts" />
{% endblock %}
{% endmacro %}
{% if skip_definitions is not defined or skip_definitions != 'true' %}
......
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