Skip to content

Add a tools:remove rule to the discovery service definition. #2563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Add a tools:remove rule to the discovery service definition. #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions firebase-common/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
android:exported="false"
tools:targetApi="n">
<!--This registrar is not defined in the dynamic-module-support sdk itself to allow non-firebase
clients to use it as well, by defining this registrar in their own core/common library.-->
<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamicloading.DynamicLoadingRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>
tools:targetApi="n" />
</application>
</manifest>
12 changes: 12 additions & 0 deletions firebase-components/firebase-dynamic-module-support/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,16 @@
package="com.google.firebase.dynamicloading">
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
<!--<uses-sdk android:minSdkVersion="14"/>-->

<application>
<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:exported="false"
tools:remove="android:splitName">
<!-- The above splitName removal is necessary to avoid manifest merge conflicts
when more than one dynamic-feature module depends on Firebase libraries. -->
<meta-data android:name="com.google.firebase.components:com.google.firebase.dynamicloading.DynamicLoadingRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>
</application>
</manifest>